From 56a8f924d2642a052516ca91acaaab493fcc1c87 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 26 Jun 2012 10:37:49 -0400
Subject: [PATCH] Move upgrader from setup directory to scp
---
{setup/inc => include}/class.migrater.php | 0
{setup/inc => include}/class.setup.php | 0
{setup/inc => include}/class.upgrader.php | 0
.../upgrader/aborted.inc.php | 0
.../upgrader/done.inc.php | 0
.../patches}/02decaa2-60fcbee1.patch.sql | 0
.../patches}/49478749-c2d2fabf.patch.sql | 0
.../patches}/522e5b78-02decaa2.patch.sql | 0
.../patches}/60fcbee1-f8856d56.patch.sql | 0
.../patches}/7be60a84-522e5b78.patch.sql | 0
.../patches}/abe9c0cb-bbb021fb.patch.sql | 0
.../patches}/bbb021fb-49478749.patch.sql | 0
.../patches/c00511c7-7be60a84.patch.sql | 0
.../patches}/c2d2fabf-aa4664af.patch.sql | 0
.../patches}/f8856d56-abe9c0cb.patch.sql | 0
.../upgrader/prereq.inc.php | 0
.../inc => include/upgrader}/upgrade.inc.php | 0
scp/images/cog.png | Bin 0 -> 2353 bytes
scp/images/no.png | Bin 0 -> 1396 bytes
scp/images/yes.png | Bin 0 -> 1274 bytes
scp/js/upgrader.js | 58 +++++++
{setup => scp}/upgrade.php | 0
setup/inc/class.attachment.migrate.php | 162 ------------------
23 files changed, 58 insertions(+), 162 deletions(-)
rename {setup/inc => include}/class.migrater.php (100%)
rename {setup/inc => include}/class.setup.php (100%)
rename {setup/inc => include}/class.upgrader.php (100%)
rename setup/inc/upgrade-aborted.inc.php => include/upgrader/aborted.inc.php (100%)
rename setup/inc/upgrade-done.inc.php => include/upgrader/done.inc.php (100%)
rename {setup/inc/sql => include/upgrader/patches}/02decaa2-60fcbee1.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/49478749-c2d2fabf.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/522e5b78-02decaa2.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/60fcbee1-f8856d56.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/7be60a84-522e5b78.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/abe9c0cb-bbb021fb.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/bbb021fb-49478749.patch.sql (100%)
rename setup/inc/sql/v1.6st-1.7-upgrade-mysql.sql => include/upgrader/patches/c00511c7-7be60a84.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/c2d2fabf-aa4664af.patch.sql (100%)
rename {setup/inc/sql => include/upgrader/patches}/f8856d56-abe9c0cb.patch.sql (100%)
rename setup/inc/upgrade-prereq.inc.php => include/upgrader/prereq.inc.php (100%)
rename {setup/inc => include/upgrader}/upgrade.inc.php (100%)
create mode 100755 scp/images/cog.png
create mode 100644 scp/images/no.png
create mode 100644 scp/images/yes.png
create mode 100644 scp/js/upgrader.js
rename {setup => scp}/upgrade.php (100%)
delete mode 100644 setup/inc/class.attachment.migrate.php
diff --git a/setup/inc/class.migrater.php b/include/class.migrater.php
similarity index 100%
rename from setup/inc/class.migrater.php
rename to include/class.migrater.php
diff --git a/setup/inc/class.setup.php b/include/class.setup.php
similarity index 100%
rename from setup/inc/class.setup.php
rename to include/class.setup.php
diff --git a/setup/inc/class.upgrader.php b/include/class.upgrader.php
similarity index 100%
rename from setup/inc/class.upgrader.php
rename to include/class.upgrader.php
diff --git a/setup/inc/upgrade-aborted.inc.php b/include/upgrader/aborted.inc.php
similarity index 100%
rename from setup/inc/upgrade-aborted.inc.php
rename to include/upgrader/aborted.inc.php
diff --git a/setup/inc/upgrade-done.inc.php b/include/upgrader/done.inc.php
similarity index 100%
rename from setup/inc/upgrade-done.inc.php
rename to include/upgrader/done.inc.php
diff --git a/setup/inc/sql/02decaa2-60fcbee1.patch.sql b/include/upgrader/patches/02decaa2-60fcbee1.patch.sql
similarity index 100%
rename from setup/inc/sql/02decaa2-60fcbee1.patch.sql
rename to include/upgrader/patches/02decaa2-60fcbee1.patch.sql
diff --git a/setup/inc/sql/49478749-c2d2fabf.patch.sql b/include/upgrader/patches/49478749-c2d2fabf.patch.sql
similarity index 100%
rename from setup/inc/sql/49478749-c2d2fabf.patch.sql
rename to include/upgrader/patches/49478749-c2d2fabf.patch.sql
diff --git a/setup/inc/sql/522e5b78-02decaa2.patch.sql b/include/upgrader/patches/522e5b78-02decaa2.patch.sql
similarity index 100%
rename from setup/inc/sql/522e5b78-02decaa2.patch.sql
rename to include/upgrader/patches/522e5b78-02decaa2.patch.sql
diff --git a/setup/inc/sql/60fcbee1-f8856d56.patch.sql b/include/upgrader/patches/60fcbee1-f8856d56.patch.sql
similarity index 100%
rename from setup/inc/sql/60fcbee1-f8856d56.patch.sql
rename to include/upgrader/patches/60fcbee1-f8856d56.patch.sql
diff --git a/setup/inc/sql/7be60a84-522e5b78.patch.sql b/include/upgrader/patches/7be60a84-522e5b78.patch.sql
similarity index 100%
rename from setup/inc/sql/7be60a84-522e5b78.patch.sql
rename to include/upgrader/patches/7be60a84-522e5b78.patch.sql
diff --git a/setup/inc/sql/abe9c0cb-bbb021fb.patch.sql b/include/upgrader/patches/abe9c0cb-bbb021fb.patch.sql
similarity index 100%
rename from setup/inc/sql/abe9c0cb-bbb021fb.patch.sql
rename to include/upgrader/patches/abe9c0cb-bbb021fb.patch.sql
diff --git a/setup/inc/sql/bbb021fb-49478749.patch.sql b/include/upgrader/patches/bbb021fb-49478749.patch.sql
similarity index 100%
rename from setup/inc/sql/bbb021fb-49478749.patch.sql
rename to include/upgrader/patches/bbb021fb-49478749.patch.sql
diff --git a/setup/inc/sql/v1.6st-1.7-upgrade-mysql.sql b/include/upgrader/patches/c00511c7-7be60a84.patch.sql
similarity index 100%
rename from setup/inc/sql/v1.6st-1.7-upgrade-mysql.sql
rename to include/upgrader/patches/c00511c7-7be60a84.patch.sql
diff --git a/setup/inc/sql/c2d2fabf-aa4664af.patch.sql b/include/upgrader/patches/c2d2fabf-aa4664af.patch.sql
similarity index 100%
rename from setup/inc/sql/c2d2fabf-aa4664af.patch.sql
rename to include/upgrader/patches/c2d2fabf-aa4664af.patch.sql
diff --git a/setup/inc/sql/f8856d56-abe9c0cb.patch.sql b/include/upgrader/patches/f8856d56-abe9c0cb.patch.sql
similarity index 100%
rename from setup/inc/sql/f8856d56-abe9c0cb.patch.sql
rename to include/upgrader/patches/f8856d56-abe9c0cb.patch.sql
diff --git a/setup/inc/upgrade-prereq.inc.php b/include/upgrader/prereq.inc.php
similarity index 100%
rename from setup/inc/upgrade-prereq.inc.php
rename to include/upgrader/prereq.inc.php
diff --git a/setup/inc/upgrade.inc.php b/include/upgrader/upgrade.inc.php
similarity index 100%
rename from setup/inc/upgrade.inc.php
rename to include/upgrader/upgrade.inc.php
diff --git a/scp/images/cog.png b/scp/images/cog.png
new file mode 100755
index 0000000000000000000000000000000000000000..20171bc655e21cb8df4b800230f7b2867d2f0ca2
GIT binary patch
literal 2353
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoBuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFe_z-M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD05>+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAq<CHch}`2`Bj
z!KMnniOHFHAU;^VudkJ7UU5lcUUI6Zi>*>cZh>BAW{Q=Gg^`=7i;1(7ql=-Tp{s$D
zi<66+k)flZv6G3Bo0%z0uS<S%X>Mv>2~2MaLaz%>y`ZE33Jxom)S}F?)D*X({9FaF
zm#s2!yTuWwc~HG6xZUD}Q?I_Af{i{XVv!;mCKTl224aHKBq)8_DIgMlYF>)1QjwCq
zT}FgXIRgXhQcoAhkcwMd!nl2=rb^WPJH7M3L~D+w6S+-1f}#^cR9ffEx};?8d;O@2
za_-ifb6%LNUVB<+`!<uU23w_OY0lEnnBEoOA(Qo-p|7t<Sdnjf@q+`FMS1_P|2{l3
zTTeH;_V(ugzxRKxy<c59@4K!2af!qKt$da<ytaJsEK$K!tZt21s89E`$<Z51ZyPPy
zQ1m4H%>k>W92c)MTkL)K@H?yO`j!P>_I%gt`*nVSphXMYiih01&y<BKbYypKT<GC$
zA$HEg_0}a8lld1PrSE<%sBAF5%^;|4yQ*%^Ga-}BX$ES7JuP8PjTiW?ec{yGH=*av
zr|TQ%C<*>AWRc_Y5s|o7_;}%$Sv?suGPlktn4O?nae8^fj+Y+4yObCu@24K=^Hu-Q
zd9`nMy*Puu=ZBKgL+n=HTR&|UEQnArG(Ef5Etum5=MhG=hG0XTMW_G1w5V{bS;08*
z@dqJs4%R;@#~KgvMSP$3_|QwYD=q9!5k}IN=T%FcHWBWWxBTCH;7*87Yz?ROE~jTQ
z#;cU8tygo&<v40J&wQzIzPE*K!>sa!pG7uIs_RntA;cth_K?wC&MTYjZe8Ymwu)KW
zk}vF6;;W~Uv$@J$Q=TljZ1--x#e<!RpZ3j9b7M*^i4sxs<y&;4vFs4T!u^YEH(K2P
zSGslLY!;SFid|u%e$y+rFa5MSJ@4cF9qRY>bu>MngmO)AI#%?`%pr00MaRwCHhwUD
z{IIyd)~w~1lGi;2jVl#p{+?d0XFjigTeOGKt!moY{uhm>)|qVC#**alw5#_<*(!s7
z%5Pccuk60=%{TkeJjPsYz8AX|Y!zI;SjD;_Qqx2KUMF*8@x%v8=|0MjALYllZ(5>0
z`H!I6<Dv_8PdivWudhF_{~*h~`}(`oP0gD7=YO|59`R?z=S|J7r7JRC9qC=eVzV%8
z;;a*sdL|?sNl8ztJm#dC^v5N1()?RfcW6E0K4bESYh7c|5+(O3+Y3&=e4WEpJ&C`7
z@9^yBi5ow9E#LQX+1)E{Ra0aZAIXVnc(eC*;gr`4N<8y2`F1Ds6r2uLIq$p9aNU#d
zCzH2sD%-y3iBm}2^DlSKX4}s3xp*k^!d;suLfP5--u!(x)yA-=<kKS=m*RybmVzC2
zPIG*89bfBNR9eI)TPa$XbLx2ohRRlH&z5=Gru}}d?2PFaFFs%CI-AI*wKSq$@xq*c
zn^tiB=!~Do5tDoT<FueF6F5y?T(}(7rWkGzD`vE8&Bd&9Dk%aUje13oUK#T2sbu(l
z`|OG(SJVD3?6()SvD`b!WSyGwj+jd+=G$+yw&^YK;Qsu8A+ID$@yWBr3${ot-F!Up
zREy^n1*N(Zd}%?4U(RG|RPNlB$EbSE^<3A(mExvS{Z^|t-WIXS-Dauxc;=aHc7<N<
z_RW``B&<94D}KlCSLf=_xbuYVYd$Z3{%}^LVS3pkzrgQIhp&Z8Pf~9FUGSuxwc_+|
zl^Q1IC7zEwwr>2DQF>;Q=|Z;MMVYbk@+qo+JDgoYA0EtqpRZ!n>bCSux_Zg2!zU)?
ze6Xm|-LlB6`hH2t{Pw+Zhh}!j@C4=?erd`NUh%wIb^YxB(cB3e`#UEuF4LE4dyw((
z;tAUots0dTfq`l*nFdD{T1woWimiEj>QuyI1@S2%EY26XEHp!3sAb$awb<z>$Kf4$
z%}>_ciO*d9^MUb0N46CQWR^r6ZeaHHyIru_H9l7M)l8A|;%`@{Kj)iTS$)ivr=7L>
zByZ3|->1_x9A_P9HZBaf^2%r1s<*#q7C*S8{MS;`)Uk-!XG(Qc#J7n~3uhW`oMQO@
z>d~tCbCUK}%r(6F?*2@rq^ssrG<Gspb@V44$a^_edO^*xmpiOW&i+n{mnz@wo@qHh
z{6R_7`xVx|ir@Tt|62C#@^hEu_UaV9yI-fHQIj0Pb^Zg-^utn_uXlU(-V4>&7k<L^
xs&M+6BY%(g3*EbG@g%X(ey9ES*Y+$D4A&<6X6y~l^Z_+uJYD@<);T3K0RT=w<o*Bv
literal 0
HcmV?d00001
diff --git a/scp/images/no.png b/scp/images/no.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fc50c6bc73a1a93754306483dd15aaa45e188dd
GIT binary patch
literal 1396
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLBuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFe_z-M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD05>+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAq<CHch}`2`Bj
z!KMnniOHFHAU;^VudkJ7UU5lcUUI6Zi>*>cZh>BAW{Q=CtFxP_tAT-&qqCWzp{s$D
zi<66+k)flZv6G3Bo0%z0uS<S%X>Mv>2~2MaLa!lCy`ZE33Jxom)S}F?)D*X({9FaF
zm#s2!xy8lJ6{mSny(zfd;^O9pQ?I_Af{i{XVv!;mCKTl224aHKBq)8_DIgMlYF>)1
zQjwCqU2CdSECU1M3r`ovkcwMLfByfsXVz@sbebEvwPT^#lWRvm&(Lyc+PW~kk?Vn!
z-}<PGqD1EA-r2WKEt@SK@a4{)3OS7v39qwi693K&<z6V&bAC-?!H0w&pSus<b54zv
zy(70EZR*leo^SJb_SZ8n<!L-6AtBLNx1;dkoKJ_m!m9b%7L@PU`TtEsx%#@^i4z?&
z9aUGS8yw!g-l23q|GOQtFRWXbe}v<sNkIRfH%fli<r7XaIo&tcWxq7%Um(x>`;3zJ
z`QKN}xU@Vmfn_V>BZdWXGc#}6T+8Ee=vG-G*$`$^&lK|E>4|gdH!mx!3N&f>GRI!~
z-h7per(D7be+qKGcOTj*)pqQ~L9XzR->>_#*)g`s-<PcWlknj2|Ie?jzg09yoWK7<
ze^SJW4<Ganf6wQ+zu(Aam-eKPGxsG5{{E3{nJAzhYhT{B{#vlr`qqax>=eGgoLTG8
z?=joL(7?zb!rFdjz~7~*?QMcL5*>KM&(GWU{>;z%=V$(>?sH&CiMK9)Cgrk0Mulk#
z6X!fzW+T~-_qUAx-8Xz(-+24K)ArqEJ>lo){o-f4er_&XQDc+BmSnaL-irkV*Ottl
z#`C{eCNI*Ef%jiO%er}%tRjErKdv}E>EVSpCj)o|Y|YPH2z7pIS^R33<l)Ad!iq6&
dL6glL8W<U7h-n3@7qNf~LQhvemvv4FO#q9f1_l5C
literal 0
HcmV?d00001
diff --git a/scp/images/yes.png b/scp/images/yes.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ccfa4569a5fcdc4a9de556dba0c19a20d807233
GIT binary patch
literal 1274
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLBuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFe_z-M3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB
zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~
za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&jv
zGt@IQHZeCh*HJJsFf`CNFw!?P(ls=<GB&a@Fi?O3B|8P1qLehNAQv~NT}3Hrwn`Z#
zB?VUc`sL;2dgaD?`9<mahL)C=ATx}Nbc<5bbc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~kxn8e5TD05>+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAq<CHch}`2`Bj
z!KMnniOHFHAU;^VudkJ7UU5lcUUI6Zi>*>cZh>BAW{Q=CtFxP_tAUA=qqCWzp{s$D
zi<66+k)flZv6G3Bo0%z0uS<S%X>Mv>2~2MaLa!-Ky`ZE33Jxom)S}F?)D*X({9FaF
zm#s2!yTu5nc~HG6xZPrmQ?I_Af{i{XVv!;mCKTl224aHKBq)8_DIgMlYF>)1QjwCq
zorb;UJq8BGJWm(LkcwMLfByfsXVz@!Y;<v0)Al+1y#Aei9TB_^SAF?!nf<x#G^Oox
z__^!%v&%LY{r&u%Kauyj-u%^jVxMO|W(@iJ`+fe3wx7}Bb9NW;b-&Vn?!7+zr{#~j
z{~!N;e}8{}U9-sshL3mpyCw7teUe@nUNUqFs@3}+<T)k%$no>?jdyh2xA|Xs+j#54
z=kNXtTz=iWQ#}2=bIAO?C447(zi`xlefRbJ{r%V8-De2NU6ReR_2KdN^Zny&JiqjM
zM@+YxpQsj~@-U<-tw1VZ!o<eJ%NKLG&!jnpD4YEG^Y!z+$<+?7g4#k2O09xB%jNH~
z8kx!7-gc;}apOG0J1ct*EMY8Z_}|#!;GM4!@9iq=5x2W|ZsWwn!yDI1%Z5q3lvHeI
zQC88NyR+n2vVTFxQvCo~W{bkLcH1(SzqSK=i}H$QW_-n@q|1pMvh%q!98-5mVr
z%TeS18yVSB&b{Pb9(l{9k>kXVerAJ7v-U7D@h}**eXzXk>tzfojXYibT-G@yGywnr
Ct<EU`
literal 0
HcmV?d00001
diff --git a/scp/js/upgrader.js b/scp/js/upgrader.js
new file mode 100644
index 000000000..8c39b73fe
--- /dev/null
+++ b/scp/js/upgrader.js
@@ -0,0 +1,58 @@
+jQuery(function($) {
+
+ $("#overlay").css({
+ opacity : 0.3,
+ top : 0,
+ left : 0,
+ width : $(window).width(),
+ height : $(window).height()
+ });
+
+ $("#loading").css({
+ top : ($(window).height() / 3),
+ left : ($(window).width() / 2 - 160)
+ });
+
+ $('form#upgrade').submit(function(e) {
+ e.preventDefault();
+ var form = $(this);
+ $('input[type=submit]', this).attr('disabled', 'disabled');
+ $('#overlay, #loading').show();
+ doTasks('upgrade.php',form.serialize());
+
+ return false;
+ });
+
+ function doTasks(url, data) {
+ function _lp(count) {
+ $.ajax({
+ type: 'POST',
+ url: 'ajax.php/upgrader',
+ async: true,
+ cache: false,
+ data: data,
+ dataType: 'text',
+ success: function(res) {
+ if (res) {
+ $('#loading #msg').html(res);
+ }
+ },
+ statusCode: {
+ 200: function() {
+ setTimeout(function() { _lp(count+1); }, 2);
+ },
+
+ 304: function() {
+ $('#loading #msg').html("We're done... cleaning up!");
+ setTimeout(function() { location.href =url;}, 3000);
+ }
+ },
+ error: function() {
+ $('#loading #msg').html("Something went wrong");
+ setTimeout(function() { location.href =url;}, 1000);
+ }
+ });
+ };
+ _lp(0);
+ }
+});
diff --git a/setup/upgrade.php b/scp/upgrade.php
similarity index 100%
rename from setup/upgrade.php
rename to scp/upgrade.php
diff --git a/setup/inc/class.attachment.migrate.php b/setup/inc/class.attachment.migrate.php
deleted file mode 100644
index 20385fd93..000000000
--- a/setup/inc/class.attachment.migrate.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/*********************************************************************
- class.attachment.migrate.php
-
- Attachment migration from file-based attachments in pre-1.7 to
- database-backed attachments in osTicket v1.7. This class provides the
- hardware to find and retrieve old attachments and move them into the new
- database scheme with the data in the actual database.
-
- Copyright (c) 2006-2012 osTicket
- http://www.osticket.com
-
- Released under the GNU General Public License WITHOUT ANY WARRANTY.
- See LICENSE.TXT for details.
-
- vim: expandtab sw=4 ts=4 sts=4:
-**********************************************************************/
-include_once(INCLUDE_DIR.'class.file.php');
-
-class AttachmentMigrater {
- function AttachmentMigrater() {
- $this->queue = array();
- $this->current = 0;
- $this->errors = 0;
- $this->errorList = array();
- }
- /**
- * Identifies attachments in need of migration and queues them for
- * migration to the new database schema.
- *
- * @see ::next() for output along the way
- *
- * Returns:
- * TRUE/FALSE to indicate if migration finished without any errors
- */
- function start_migration() {
- $this->findAttachments();
- $this->total = count($this->queue);
- }
- /**
- * Process the migration for a unit of time. This will be used to
- * overcome the execution time restriction of PHP. This instance can be
- * stashed in a session and have this method called periodically to
- * process another batch of attachments
- */
- function do_batch($max, $time=20) {
- $start = time();
- $this->errors = 0;
- while (count($this->queue) && $count++ < $max && time()-$start < $time)
- $this->next();
- # TODO: Log success/error indication of migration of attachments
- return (!$this->errors);
- }
-
- function queue($fileinfo) {
- $this->queue[] = $fileinfo;
- }
- function getQueueLength() { return count($this->queue); }
- /**
- * Processes the next item on the work queue. Emits a JSON messages to
- * indicate current progress.
- *
- * Returns:
- * TRUE/NULL if the migration was successful
- */
- function next() {
- # Fetch next item -- use the last item so the array indices don't
- # need to be recalculated for every shift() operation.
- $info = array_pop($this->queue);
- # Attach file to the ticket
- if (!($info['data'] = @file_get_contents($info['path']))) {
- # Continue with next file
- return $this->error(
- sprintf('%s: Cannot read file contents', $info['path']));
- }
- # Get the mime/type of each file
- # XXX: Use finfo_buffer for PHP 5.3+
- $info['type'] = mime_content_type($info['path']);
- if (!($fileId = AttachmentFile::save($info))) {
- return $this->error(
- sprintf('%s: Unable to migrate attachment', $info['path']));
- }
- # Update the ATTACHMENT_TABLE record to set file_id
- db_query('update '.TICKET_ATTACHMENT_TABLE
- .' set file_id='.db_input($fileId)
- .' where attach_id='.db_input($info['attachId']));
- # Remove disk image of the file. If this fails, the migration for
- # this file would not be retried, because the file_id in the
- # TICKET_ATTACHMENT_TABLE has a nonzero value now
- if (!@unlink($info['path']))
- $this->error(
- sprintf('%s: Unable to remove file from disk',
- $info['path']));
- # TODO: Log an internal note to the ticket?
- return true;
- }
- /**
- * From (class Ticket::fixAttachments), used to detect the locations of
- * attachment files
- */
- /* static */ function findAttachments(){
- global $cfg;
-
- $res=db_query('SELECT attach_id, file_name, file_key, Ti.created'
- .' FROM '.TICKET_ATTACHMENT_TABLE.' TA'
- .' JOIN '.TICKET_TABLE.' Ti ON Ti.ticket_id=TA.ticket_id'
- .' WHERE NOT file_id');
- if (!$res) {
- return $this->error('Unable to query for attached files');
- } elseif (!db_num_rows($res)) {
- return true;
- }
- $dir=$cfg->getUploadDir();
- while (list($id,$name,$key,$created)=db_fetch_row($res)) {
- $month=date('my',strtotime($created));
- $info=array(
- 'name'=> $name,
- 'attachId'=> $id,
- );
- $filename15=sprintf("%s/%s_%s",rtrim($dir,'/'),$key,$name);
- $filename16=sprintf("%s/%s/%s_%s",rtrim($dir,'/'),$month,$key,$name); //new destination.
- if (file_exists($filename15)) {
- $info['path'] = $filename15;
- } elseif (file_exists($filename16)) {
- $info['path'] = $filename16;
- } else {
- # XXX Cannot find file for attachment
- $this->error(sprintf('%s: Unable to locate attachment file',
- $name));
- # No need to further process this file
- continue;
- }
- # TODO: Get the size and mime/type of each file.
- #
- # NOTE: If filesize() fails and file_get_contents() doesn't,
- # then the AttachmentFile::save() method will automatically
- # estimate the filesize based on the length of the string data
- # received in $info['data'] -- ie. no need to do that here.
- #
- # NOTE: The size is done here because it should be quick to
- # lookup out of file inode already loaded. The mime/type may
- # take a while because it will require a second IO to read the
- # file data. To ensure this will finish before the
- # max_execution_time, perform the type match in the ::next()
- # method since the entire file content will be read there
- # anyway.
- $info['size'] = @filesize($info['path']);
- # Coroutines would be nice ..
- $this->queue($info);
- }
- }
-
- function error($what) {
- $this->errors++;
- $this->errorList[] = $what;
- # Assist in returning FALSE for inline returns with this method
- return false;
- }
- function getErrors() {
- return $this->errorList;
- }
-}
--
GitLab