From bde018568894510be163aed9c57e1ce03bd1babb Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 27 Oct 2015 14:39:20 -0400 Subject: [PATCH] Various updates and fixes --- classes/data/dataMemberInfo.php | 37 ++ controllers/admin.php | 6 + lib/html5-File-Upload/assets/css/styles.css | 256 -------------- .../assets/img/background_tile_1.jpg | Bin 2394 -> 0 bytes .../assets/img/background_tile_2.jpg | Bin 2418 -> 0 bytes .../assets/img/background_tile_3.jpg | Bin 2347 -> 0 bytes .../assets/img/blue_line.jpg | Bin 1283 -> 0 bytes lib/html5-File-Upload/assets/img/done.png | Bin 3399 -> 0 bytes lib/html5-File-Upload/assets/img/logo.jpg | Bin 11044 -> 0 bytes lib/html5-File-Upload/assets/img/tzine.png | Bin 1263 -> 0 bytes .../assets/js/jquery.filedrop.js | 315 ------------------ .../assets/js/upload-script.js | 102 ------ lib/html5-File-Upload/post_file.php | 59 ---- lib/html5-File-Upload/sample-index.html | 41 --- models/admin/dashboardWidget/index.php | 7 + models/admin/management/import.php | 22 +- models/admin/members/index.php | 9 +- models/admin/members/list.php | 24 ++ views/admin/dashboardWidget/index.html | 31 +- .../admin/management/import/readDatabase.html | 2 + views/admin/member/index.html | 31 +- views/admin/member/memberInfo.html | 2 - views/admin/members/index.html | 43 ++- views/admin/members/list.html | 22 +- 24 files changed, 199 insertions(+), 810 deletions(-) delete mode 100644 lib/html5-File-Upload/assets/css/styles.css delete mode 100644 lib/html5-File-Upload/assets/img/background_tile_1.jpg delete mode 100644 lib/html5-File-Upload/assets/img/background_tile_2.jpg delete mode 100644 lib/html5-File-Upload/assets/img/background_tile_3.jpg delete mode 100644 lib/html5-File-Upload/assets/img/blue_line.jpg delete mode 100644 lib/html5-File-Upload/assets/img/done.png delete mode 100644 lib/html5-File-Upload/assets/img/logo.jpg delete mode 100644 lib/html5-File-Upload/assets/img/tzine.png delete mode 100644 lib/html5-File-Upload/assets/js/jquery.filedrop.js delete mode 100644 lib/html5-File-Upload/assets/js/upload-script.js delete mode 100644 lib/html5-File-Upload/post_file.php delete mode 100644 lib/html5-File-Upload/sample-index.html diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php index 21f19388..23e1d60c 100644 --- a/classes/data/dataMemberInfo.php +++ b/classes/data/dataMemberInfo.php @@ -451,6 +451,43 @@ class GlmDataMemberInfo extends GlmDataAbstract } + /* + * Get simplified list of member info records. + * + * @param string $where Where clause + * Note the table refernces M and I. + * + * @return object Class object + * + */ + public function getSimpleMemberInfoList($where = '') + { + + // Save current list of fields + $f = $this->fields; + + // Replace fields list with limited list + $this->fields = array( + 'id' => $f['id'], + 'member' => $f['member'], + 'member_name' => $f['member_name'], + 'member_slug' => $f['member_slug'], + 'member_pointer' => $f['member_pointer'], + 'reference_name' => $f['reference_name'], + 'status' => $f['status'], + 'create_time' => $f['create_time'], + 'modify_time' => $f['modify_time'] + ); + + // Get the simplified list + $list = $this->getList($where); + + // Restore full fields list + $this->fields = $f; + + return $list; + } + } diff --git a/controllers/admin.php b/controllers/admin.php index b5fa09a0..d140cac5 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -465,6 +465,12 @@ class glmMembersAdmin extends GlmPluginSupport ) ); + // Set widget default position to right column + global $wp_meta_boxes; + $glm_dashboard_widget = $wp_meta_boxes['dashboard']['normal']['core']['glm_members_admin_dashboard_widget']; + unset($wp_meta_boxes['dashboard']['normal']['core']['glm_members_admin_dashboard_widget']); + $wp_meta_boxes['dashboard']['side']['core']['glm_members_admin_dashboard_widget'] = $glm_dashboard_widget; + } } diff --git a/lib/html5-File-Upload/assets/css/styles.css b/lib/html5-File-Upload/assets/css/styles.css deleted file mode 100644 index 5f2545d4..00000000 --- a/lib/html5-File-Upload/assets/css/styles.css +++ /dev/null @@ -1,256 +0,0 @@ -/*------------------------- - Simple reset ---------------------------*/ - - -/* -*{ - margin:0; - padding:0; -} -*/ - - -/*------------------------- - General Styles ---------------------------*/ - -/* - -html{ - background:url('../img/background_tile_2.jpg'); - min-height:100%; - position:relative; - -} - -body{ - color:#fff; - min-height:600px; - font:14px/1.3 'Segoe UI',Arial, sans-serif; -} - -a, a:visited { - text-decoration:none; - outline:none; - color:#54a6de; -} - -a:hover{ - text-decoration:underline; -} - -header, footer{ - display:block; -} - -*/ - -/*------------------------- - Header Styles ---------------------------*/ - -/* - -header{ - background:url('../img/background_tile_1.jpg'); - padding:75px; - position: relative; -} - -header:before, -#dropbox:before{ - display: block; - content:''; - height:4px; - width:100%; - background:url('../img/blue_line.jpg'); - position: absolute; - top:0; - left:0; - box-shadow:0 2px 2px rgba(0,0,0,0.4); -} - - -h1{ - background:url('../img/logo.jpg') no-repeat top center; - height:92px; - overflow: hidden; - text-indent: -99999px; - text-align: center; -} - -*/ - -/*------------------------- - Dropbox Element ---------------------------*/ - - - -#dropbox{ -/* - background:url('../img/background_tile_3.jpg'); - - border-radius:3px; - position: relative; - margin:80px auto 90px; - min-height: 290px; - overflow: hidden; - padding-bottom: 40px; - width: 990px; - - box-shadow:0 0 4px rgba(0,0,0,0.3) inset,0 -3px 2px rgba(0,0,0,0.1); -*/ -} - - -#dropbox .message{ - font-size: 11px; - text-align: center; - padding-top:160px; - display: block; -} - -#dropbox .message i{ - color:#ccc; - font-size:10px; -} - -#dropbox:before{ - border-radius:3px 3px 0 0; -} - - - -/*------------------------- - Image Previews ---------------------------*/ - - - -#dropbox .preview{ - width:245px; - height: 215px; - float:left; - margin: 55px 0 0 60px; - position: relative; - text-align: center; -} - -#dropbox .preview img{ - max-width: 240px; - max-height:180px; - border:3px solid #fff; - display: block; - - box-shadow:0 0 2px #000; -} - -#dropbox .imageHolder{ - display: inline-block; - position:relative; -} - -#dropbox .uploaded{ - position: absolute; - top:0; - left:0; - height:100%; - width:100%; - background: url('../img/done.png') no-repeat center center rgba(255,255,255,0.5); - display: none; -} - -#dropbox .preview.done .uploaded{ - display: block; -} - - - -/*------------------------- - Progress Bars ---------------------------*/ - - - -#dropbox .progressHolder{ - position: absolute; - background-color:#252f38; - height:12px; - width:100%; - left:0; - bottom: 0; - - box-shadow:0 0 2px #000; -} - -#dropbox .progress{ - background-color:#2586d0; - position: absolute; - height:100%; - left:0; - width:0; - - box-shadow: 0 0 1px rgba(255, 255, 255, 0.4) inset; - - -moz-transition:0.25s; - -webkit-transition:0.25s; - -o-transition:0.25s; - transition:0.25s; -} - -#dropbox .preview.done .progress{ - width:100% !important; -} - - - -/*---------------------------- - The Footer ------------------------------*/ - -/* - -footer{ - display:block; - background-color: #151517; - - position:fixed; - width:100%; - height:70px; - bottom:0; - left:0; - z-index: 100000; - - box-shadow: 0 -1px 2px #171717; - -webkit-box-shadow: 0 -1px 2px #171717; - -moz-box-shadow: 0 -1px 2px #171717; -} - -footer h2{ - font-size:20px; - font-weight:normal; - left:50%; - margin-left:-400px; - padding:22px 0; - position:absolute; - width: 540px; - color:#eee; -} - -footer a.tzine,a.tzine:visited{ - background:url("../img/tzine.png") no-repeat right top; - border:none; - text-decoration:none; - color:#FCFCFC; - font-size:12px; - height:70px; - left:50%; - line-height:31px; - margin:23px 0 0 110px; - position:absolute; - top:0; - width:290px; -} -*/ \ No newline at end of file diff --git a/lib/html5-File-Upload/assets/img/background_tile_1.jpg b/lib/html5-File-Upload/assets/img/background_tile_1.jpg deleted file mode 100644 index ad83d30aa677d304e57339cfcb158209148dec34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2394 zcmbVMdsGu=7N0yIB!))JTG*rn&DvEuqrfbr4?7p2XO|kHgTp4K93frgiV7}FP6H)~0S0*t zW~7Qaodr(kGFV(DpUaN`*-RD_VzD7+R3wWj;6(|TEN}#LG@3!3DNsn|Be76PNFOOG zFE5Xg$6+9bl@N>1=R-_3#AZjL7LmraI+M~IsWXO*dXU0Kl|iF7X%HRg@~B*aU?91&L}WlAM-375m? zM34G-7njG4VsWJsu8hYPvsf}_G>6HTNca+-SRTb=%6X&QM4i#3)T!XnxEeI>2$%Dx zT!F*@D@}+Y9YI!&PC!}~VnU2rh#r*8`0*y|Mka)}b3?Kv%>00Pq?fctG8X zt{}#F4JZb%W5A&&93Fk*@NRe)+}z!U;qFc#cn}EgL?VeqB$EFK3=W5L!@CjP-HD## zh~qrHy-;|24;ziV$Zw=S^2Q`*D?sr8jDQh`p#WG421mg-+W{?rLGkwgfu;*!iT|y0 zDSZG89*e=^-Ekx47=S`!iRLI*7d_fqi#>AsqT?}@&Q^#iF18C}UNICFO|+Wov;$<6 zjHTcxKrC=Ges;YZ(Q*W%_1!Q)M)`Sf;y^{ZQBkM6K z?yGSp)9Ozb{%U=-RapFwCeMO!@D8n%EA%_Ktu=|Ucys;ZBC>Lx|lcUa@f+qjr-2OG8A{er>yHXZnCd({EY>^e?||My;`@}&f+ zyF?yLO*EItWY<1CL|)(-uWfGbKEq+JL*xp793gsAhBTzI10VFGxw9~-_#@gC+T_^2 z1M|z)4XsRa?>l`d+_C30DIvds9arf4B;{~htM3Ea)`b0MxxY|Lt7mkaD9(D;TP$0I z^OFB-Q+FA8(cS=|SXr)p->o42@x?%}#P@89zpCK*4(N7sYg~~nH~Xw+y2+YwHgAH$ zA3vkFHp~*_1kSZpPkvHkPm&9yGzvty`9;GF{xPrbf?%sq6Hqd6rR8GkoS_TrexDLJ zWmm+u((8UPrMSVNzW$?YEYHSQd}@vRA+c1^tL64sCxD_*Bx|6L!)SkQJsjH}oa`n= zf~r2M3Y@hiLpFP9*0|e5`1_%i09be7~P|xhvk!RaMS8ThJr8L-*3bkXM6mT>A; zdILV;UiPJ_%aeR&5QYc}>z>HiTbuyOkMgA2CBb+4e72oi8I~jsbnjdr0Syjxu)jQ< zO|SdL&$oRIOgjo5=;jAagA)&3Hf$>T?08OEZTZ8`3k2}Ak8dTcn`IF_4#(W@FZ3&$ z7~)^=x2>V1S^8e(cssWu{)rm=c9G6*^EI5;SADk=>tS1wbq4MmALP|)lw@})!XjrE z742FwjsX1>T6TSLZut7+)vxEZOZ+2WTN`Mcdqo)E(58<4L5dsi!^`NmW9sL4EI)sT zgo|$ZoVuDqzG&NhqUO;hYI*S9DYO(f8|S?~+vb_)g?LKX(GQP+K2VDzW1}K|S>-Ou z@w(X+Eb4jLL>u_m$u(2whBk>Uulz!Lp4*$JBAp5QLh%cmOu72@iL*Novaa4ukR%jt zx2n@$kDnP|F`gFJf*cg=KJJJs=*5=bTXOqYvuOE>>4Q`HQp`QD!tc7LBN6D{QBS?I z@VDCH-dR0UO2QhdX!BO9nio^<-fr-T2<&}hJ&>*6Q_-;r>h>!T51Vu|l%}x+>yT{W#XMcapeD}`%-Pd>T zSbwzk0G?4M)dm0%ivs`$-~+4!09lx(NZthC00O3t1psRgs7*2&bv!yuNeK^w=9_pXwN8y1<&a68qA~DHp_FmwJnU>!(<#uni7`2p5^0MH$t1CmK&wX~ z77Y$kz##|}5==vaVQw&&3Nc^=rXvhG%nm|e9*fO`5oiJwESg@qffpwfO~k^aP|8G6 z85tS03?@yhPoyJUE|(57=nO^>W)WoAq%q1(K^lYaqz55tQ0P@Uqe`oRY#!wa+B9P* z1KeB;7~{|nX?)b$uzZsarN^NLZJJ(zV&=Y+WUP0;AIN5i zWy4#dS7DbTPZ4SrX=+qs6bnNs*cX~orR4G1LIJ{NvKWjgRuqgNd}d^Dq!1PgM1o)@ zm&uv*@i8uo#fGEUOhFWj!AFoNn8Sp*0s&XR;)~cUSj3v-iZuqKT%$lIv>nL5Y?;FQKd+)RYT+b z<*7arpU?kab-&{(|DT@Gv1I7B;rNeXnN(pDXgj_ieN1@2Jg5fS7(KQc);w|9CrBU?Y#`bZ$6;q@Z|`7lZ$~0II+93EzXc8iK_Y=jva=(7 zGKDnd6BlO;E-vFn6ECNC(r;NPJi6D*);K?|UjI*`^Isk{^!~X+I7r>ML zTZd`!uC@|zAf8|kfaCU^wW<|=E zrdsa+P9PS643dFxpqC>C`pIM89(=;P2!_u*<*-ls(syd)=Wd1g!{_VnRBns-Wrhz| zA`F?K@Tr`!)e&9K_Evd(CPP|l`enIOBhEc~&Y&)I+R<$$%}i*>M5&{`mvDtJn!=)1P{mpQ0v)h3$8rvmo-A zZ1l`*%j2@?uNLByN4ty5v!^ZTUAr9T*K*WS)j3*QTDXJuc6ddV*4}MP%NH#Wp|&|% znorG|Jqmq#Hu~+e{??P;V8oURgc_gtN@N9ykG)<0YZuRN zF0JfTHXh`4ZK!Ej|1z!JOktE>yRj;FRYuA7JMQ~pQQt)ym(6-yv~ue49~T5KDRNEl z81iesoafP8R@AirLYX)f325@4pWMGxMGgi6x;*n1!`>@Im6u7^ob!)5oK`UpCv;EC z(N4=4UDO(%yL#r|9c#n=?vEU`1Q%{CcKDg_X;UAk^x81lrG1{c5yKV_W3{G0~i7KTdX** zsJ^tPGYaxbS8Q*t^Yd0)ffU!a-YeDMv$3nOr|g{9zSzr~a*OADyJQvcpxf`QWiP1e zxMY65=R8nW;(m4P`1Q)VoX)^pV&1x&hI^Ls*`_vrOcSwZiLfsW*JT81|G z$Hzoz1I->}Hwkqh`rGoU5mH%TZNmK?yPZFYce+}Eg2srV=JIK{;4`_^_TR1acdkn3 zU7yu#8RO^V-_^YE%q}hPX_ejE*h6W|E_G6E{rb`A-q+#YD7ZWFDSjbL^8Lfl5~ACB zML?=PuXb?$%KjX)FhpPZ8b`VP@{c7_)K%GCl<_j3;J^(G^JBYIHa^;crg6yln@&qF znMpYnKYZTN@J%#R>L-yuxTI8dC~Bq`aFYF}|Md;?z`Cj}9V4!?^eqyi@Wnq-i>GI@ zK%d~>yJL;{^c=W*iN^j?sbfBL>&aXF;fT!FLyz>-{1Z@po<&%}IubqFZo1;_D|1Rw z3*g}!^=8oj-df)_VkX~Gzs*PRYfJt#m(8+m4TS>_(qHjKse@1&VI?EsFUkiYy+V43 zo^YaHS&T@}4l}$xYlP8X?AhK(HSKjIl3(Wy_!M4ok?)eSs(DWMl);t#S&NG(@qas7 z(E8o+u`>g>W=+&~&cm9qOR-s144fC3{HN&RnKGxoRG;Y&Bg2#2`?3@Q%`fsd!yxY& zEmttC6XkWeaDElXb?S4-?UiJ^yGv`rN1iQktD;r+8ax9}X0JZiE|PwoQ+9_bZ9CEK zSIG2xgKIuy-dENAP%_5~kiXnag1n$&YGP~FgBR&1KYRXMr7)*_ZdpUV zQMa=-(^Pk8sG&sae8BS_Wo{b%$%T1Y>(f@>H7bdvQjs+5CU}f3zfk?>`5f8C#`TWT WCHhnS*_OtdmIiTnW>K#7_P+uBi*Q!} diff --git a/lib/html5-File-Upload/assets/img/background_tile_3.jpg b/lib/html5-File-Upload/assets/img/background_tile_3.jpg deleted file mode 100644 index ac39d60eaa390a0ba280ceaacbda34e741719e6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 zcmbVMc~nzp7XOl$0AUGr60)n<6Ff7)J zxKs{xNoCO%YAslWDY8jBv}YNY)IDZ z$(uvW9-)jS59#}e=at6&a`&0?}SOjblVnNft8~3)4jO zxuUYNvKU!h25Q>DWD5iWCX2)5aKbS}xH-pQQD=u6%mMQrWQbW~(itr})Brm?s?$)b zMMTFkoh?CcR45i4zpz_+y`!!fwAqq`JWu0=XmfIo5n(1FX4GoZAQ(Jgo{aVGj{`Y? zST@3qCLMMu>RmEaW7Q)DOPowZ$G$MMI;~I=A(OHrxO@&r&X=>;YzbG)6U$gKX^fP| z6>uZxeY}Xv=X1q!4o@oQb0loGoE6Ds38YeilrM>i;Im@*^V~Rt*`hXRkomYeEbbgv z@`qfZ)P$%ls3{pmcg;^gLONKk;1>kKP7ncmLIfhgAw(zQj5s+tJG(eLJCR7Pt|XHC?*#`z5RpJ6IXRI$ z+(>R7o@7isJ!e33FZWsP_q+wo-VUfP;4P2_;iv#l#X(e@y&D(-4wL8q4=i1PC;hh# zv*IZLN5ErQ5b)3}9tWr^*y2QWX8xI}3j9YMeT#-959w((s)LPrnS(hxKxMBGXR7ln z7TIqBcg&8bLR1h1MuYP?(@j?WsGp?tuy##R{Cj~R(Viu565Qi2z4tn2BJ|K#D?36@ zAM9eBO>KRRn3&Rak(+r$2Dx;|OFxz0mr=&9ZL@yRKcK#O zC3b1-8^Lb(+-=>`u5ZFS&m2$Caw|qcYN-#G)X0%<7ZY>Fm%+6`E%~F!A#Ph(aKXkq zuv^)Zt*2|+m;FVq5K1Py5+iMhhIt}ZSm_3u{HTSdML^$S+t-I?F`K<-J2d- z@@R`#DsKF;T=_#i!cE+FXSt`#<*gxyeyV)bQ+La66&NwqoRK+c&2QeOFB*o60vV2leN1+gqZ23!ZU2 za*dw{Xo7aax1IkPUwUzGW$kdmAi3GI^ZZ3?GXx^-AULlfjD4_e!Q3FJvk^$4|4KVCH(p~|JJ(1Wd)zb){Xww zbqDq*4|reAh=+6e%X|M^I7$gVU-gD^s504ycxm#T*iC&!E^a3#>T`4yFQ}c^bn{g< z(B2lJ#+Q$*icme-LVE4vKT_28Vd+76|7Qk zrR;4@EiVsjNT?#`)>{vKKU$PM6BDV61H^>(*1VGO!`0vz?lyS8;239m+V_a`lfrB3d*R_*eF`J1 z%IBpa*$vK3*J?6!LF(gk;e7RHdG*fOq3Wk7?m zeq-QNE#>j*4{JZXmuT~~Q*joPX~JR%(Z{bS9B zmD@r`LU4+;wi6FZXiJ?1HL88;#pA~_8|cM%59B6sn_szZd}}9jb8aGCXd=fmy&{|B zAGZXnzWiDZA){&^Xf5rymQMSblyvgbzV+2!vg>kx>gH!T{pX(U>MvT<^VAMPyeX5y zUa&^`$?E!=hdoEAhF@ZR%g;^K2QEKuh2HMXD_D1+zSeK5>}_5}#dm(4VfLH<2FS@W A-T(jq diff --git a/lib/html5-File-Upload/assets/img/blue_line.jpg b/lib/html5-File-Upload/assets/img/blue_line.jpg deleted file mode 100644 index 2af2c9f745accf14acd7da239470efb9914ec91e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1283 zcmbVMy>HV%6hFuLXlP68Rz--(a$!NlJ|{7$4WVl6L}Un5Z4rpgv9H8x?Xzr`xD^v( zV1WU_(hU~=0hmw)0|R1WLQn=&i2;dk35gAJPMfq9Rgrj-?f0I4@AKZf=uNZ%4p&2K z9)NoNIOqf06nzGawqz_U0}3RGdK!RegT}2Oa1}vtd|o$k6Y&PNg-~||k%s~}JsG;X zv48@$iLO{qnfvzSDaTr7nY$=8V8c~W%R0N_q1lylbH>VoA)DOf8TNFjgtlv=KxadH z(eahA%ypbAgpbt%$95pWLYbS2qq3J8)2xa;#7aEO8StdYo-FcW5z0mR1e=E<6vVs$ zOF0oLQb~a#yG0y{=9%-#j8@xkxVyBu-!(Z=XlR<*>+r42ki$lXgiHP(f-`Bi-Z~E z<0a2P1U}w1CcWD~Pz)s5DCa$k9E!fEVPnZgPEgm%9QnhWmZ?-qnktqGQa)dms!$Xw zg{k6{1~s*&77KD=qU&QXTS*dOwNjd@O8JT?R^dbe%Bm`>Ql(asU`^`U)*V049Rqda zS|qMitjZIr2KTj9R1fI^_U15N>`uUR3kTS5VV6~BC0=ANT8@d^etbNe)oRGIt|GJM zVVmvrSF!epU#a}7?oC_se|jd6WQ2G)b_`2bMJ6z2d!tW;-tr)aY>Y=%Bl-#sb_O1p z&&Uc=(K~PhBzi;>j!u#{olGTTN~KdBN~bfKzDy>a%^oTy(?{-v8Jc21f}v=Jik^cexhLrD>m%k;=?wLkl1^oY zL4rzx%ntDVW6Vg?NQ}>>#?ptF*ofNk7jV=_ax_{814Nx*Xa-Dz)!VOctzLS}tiQT* z^GmC)U43-)!Kuq5vzcF$qd(VPesVs%zWed}*xC_%@8Ox>;f0MK+VJX&Ytz?vKJTNq Fe*ix~S*rj5 diff --git a/lib/html5-File-Upload/assets/img/done.png b/lib/html5-File-Upload/assets/img/done.png deleted file mode 100644 index 22a14109ab18aaf8452e2acadfba1ab43e8624c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3399 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 diff --git a/lib/html5-File-Upload/assets/img/logo.jpg b/lib/html5-File-Upload/assets/img/logo.jpg deleted file mode 100644 index 5c8325231aa738dc9b7986bcf3583e9777e456bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11044 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 Rp+BMe2A%x|Q=t#@{{^+Lu$%w@ diff --git a/lib/html5-File-Upload/assets/img/tzine.png b/lib/html5-File-Upload/assets/img/tzine.png deleted file mode 100644 index df4abaf944a746a797b2dd06caeeaa4639234dc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1263 zcmV-K+4@dn=-n+0Moc)Rk$+IpR;K)CG&5w)ecopTGYp*|zwZ zL-t38}*-$a{uL??@8C)u#Cn4f4G1is7AzQ%KJOVk?byM>rw1hIrh=fRo3d*ltH-`8D}1maDQ=k8aH>C`8kF@) z9Ik7Ud1E3PtbAZO{;nli1GJ+lHoYsNDz}QHZLS?!@`MepHq_kTf+c-3%_@2pq+V6b zT~`kBTFB5g-keh#^9D;(n{2dz+Ke-dJA?c>aX3jMZPTf>%{BQ}nj3H9O(J$(nf0F@ z-J(W%j7HqpGQumXIA>Y#nOKNTjRAhS3FtF-kU?EDw~)aZhzmn420b_qcdiPQ*W)uW zl#$B0CweT4jg%QG4>Rsf=vvQGmp11;PS#Ik^RVkKH>`$Sv1S#@cmS zxYDqu^rUC{+dhbDkRhr`)SO>rK_U`rNlbPFqGtMf8$7^Zcp6|~7i&W|am_5uRcXnl zZdp^7Q3To3xB<6f)buAiNln7zf>H)`>n( z_E?=F--| zfuxfzA;W-VosI13!eyN{>05^0%TplWtiqBdAWz(Jj#bSZG3HndMAGxa0TlHYh8ws= zzsnm= opts.refresh) { - var diffData = e.loaded - this.startData; - var speed = diffData / diffTime; // KB per second - opts.speedUpdated(this.index, this.file, speed); - this.startData = e.loaded; - this.currentStart = elapsed; - } - } - } - } - - - - function upload() { - stop_loop = false; - if (!files) { - opts.error(errors[0]); - return false; - } - var filesDone = 0, - filesRejected = 0; - - if (files_count > opts.maxfiles) { - opts.error(errors[1]); - return false; - } - - for (var i=0; i max_file_size) { - opts.error(errors[2], files[i], i); - filesRejected++; - continue; - } - - reader.onloadend = send; - reader.readAsBinaryString(files[i]); - } else { - filesRejected++; - } - } catch(err) { - opts.error(errors[0]); - return false; - } - } - - function send(e) { - // Sometimes the index is not attached to the - // event object. Find it by size. Hack for sure. - if (e.target.index == undefined) { - e.target.index = getIndexBySize(e.total); - } - - var xhr = new XMLHttpRequest(), - upload = xhr.upload, - file = files[e.target.index], - index = e.target.index, - start_time = new Date().getTime(), - boundary = '------multipartformboundary' + (new Date).getTime(), - builder; - - newName = rename(file.name); - if (typeof newName === "string") { - builder = getBuilder(newName, e.target.result, boundary); - } else { - builder = getBuilder(file.name, e.target.result, boundary); - } - - upload.index = index; - upload.file = file; - upload.downloadStartTime = start_time; - upload.currentStart = start_time; - upload.currentProgress = 0; - upload.startData = 0; - upload.addEventListener("progress", progress, false); - - xhr.open("POST", opts.url, true); - xhr.setRequestHeader('content-type', 'multipart/form-data; boundary=' - + boundary); - - xhr.sendAsBinary(builder); - - opts.uploadStarted(index, file, files_count); - - xhr.onload = function() { - if (xhr.responseText) { - var now = new Date().getTime(), - timeDiff = now - start_time, - result = opts.uploadFinished(index, file, jQuery.parseJSON(xhr.responseText), timeDiff); - filesDone++; - if (filesDone == files_count - filesRejected) { - afterAll(); - } - if (result === false) stop_loop = true; - } - }; - } - } - - function getIndexBySize(size) { - for (var i=0; i < files_count; i++) { - if (files[i].size == size) { - return i; - } - } - - return undefined; - } - - function rename(name) { - return opts.rename(name); - } - - function beforeEach(file) { - return opts.beforeEach(file); - } - - function afterAll() { - return opts.afterAll(); - } - - function dragEnter(e) { - clearTimeout(doc_leave_timer); - e.preventDefault(); - opts.dragEnter(e); - } - - function dragOver(e) { - clearTimeout(doc_leave_timer); - e.preventDefault(); - opts.docOver(e); - opts.dragOver(e); - } - - function dragLeave(e) { - clearTimeout(doc_leave_timer); - opts.dragLeave(e); - e.stopPropagation(); - } - - function docDrop(e) { - e.preventDefault(); - opts.docLeave(e); - return false; - } - - function docEnter(e) { - clearTimeout(doc_leave_timer); - e.preventDefault(); - opts.docEnter(e); - return false; - } - - function docOver(e) { - clearTimeout(doc_leave_timer); - e.preventDefault(); - opts.docOver(e); - return false; - } - - function docLeave(e) { - doc_leave_timer = setTimeout(function(){ - opts.docLeave(e); - }, 200); - } - - function empty(){} - - try { - if (XMLHttpRequest.prototype.sendAsBinary) return; - XMLHttpRequest.prototype.sendAsBinary = function(datastr) { - function byteValue(x) { - return x.charCodeAt(0) & 0xff; - } - var ords = Array.prototype.map.call(datastr, byteValue); - var ui8a = new Uint8Array(ords); - this.send(ui8a.buffer); - } - } catch(e) {} - -})(jQuery); \ No newline at end of file diff --git a/lib/html5-File-Upload/assets/js/upload-script.js b/lib/html5-File-Upload/assets/js/upload-script.js deleted file mode 100644 index 33410863..00000000 --- a/lib/html5-File-Upload/assets/js/upload-script.js +++ /dev/null @@ -1,102 +0,0 @@ -$(function(){ - - var dropbox = $('#dropbox'), - message = $('.message', dropbox); - - dropbox.filedrop({ - // The name of the $_FILES entry: - paramname:'pic', - - maxfiles: 5, - maxfilesize: 2, - url: 'post_file.php', - - uploadFinished:function(i,file,response){ - $.data(file).addClass('done'); - // response is the JSON object that post_file.php returns - }, - - error: function(err, file) { - switch(err) { - case 'BrowserNotSupported': - showMessage('Your browser does not support HTML5 file uploads!'); - break; - case 'TooManyFiles': - alert('Too many files! Please select 5 at most! (configurable)'); - break; - case 'FileTooLarge': - alert(file.name+' is too large! Please upload files up to 2mb (configurable).'); - break; - default: - break; - } - }, - - // Called before each upload is started - beforeEach: function(file){ - if(!file.type.match(/^image\//)){ - alert('Only images are allowed!'); - - // Returning false will cause the - // file to be rejected - return false; - } - }, - - uploadStarted:function(i, file, len){ - createImage(file); - }, - - progressUpdated: function(i, file, progress) { - $.data(file).find('.progress').width(progress); - } - - }); - - var template = '
'+ - ''+ - ''+ - ''+ - ''+ - '
'+ - '
'+ - '
'+ - '
'; - - - function createImage(file){ - - var preview = $(template), - image = $('img', preview); - - var reader = new FileReader(); - - image.width = 100; - image.height = 100; - - reader.onload = function(e){ - - // e.target.result holds the DataURL which - // can be used as a source of the image: - - image.attr('src',e.target.result); - }; - - // Reading the file as a DataURL. When finished, - // this will trigger the onload function above: - reader.readAsDataURL(file); - - message.hide(); - preview.appendTo(dropbox); - - // Associating a preview container - // with the file, using jQuery's $.data(): - - $.data(file,preview); - } - - function showMessage(msg){ - message.html(msg); - } - -}); \ No newline at end of file diff --git a/lib/html5-File-Upload/post_file.php b/lib/html5-File-Upload/post_file.php deleted file mode 100644 index c364f940..00000000 --- a/lib/html5-File-Upload/post_file.php +++ /dev/null @@ -1,59 +0,0 @@ -$str)); - exit; -} - -function get_extension($file_name){ - $ext = explode('.', $file_name); - $ext = array_pop($ext); - return strtolower($ext); -} -?> \ No newline at end of file diff --git a/lib/html5-File-Upload/sample-index.html b/lib/html5-File-Upload/sample-index.html deleted file mode 100644 index 50aa0319..00000000 --- a/lib/html5-File-Upload/sample-index.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - HTML5 File Drag and Drop Upload with jQuery and PHP | Tutorialzine Demo - - - - - - - - - -
-

HTML5 File Upload with jQuery and PHP

-
- -
- Drop images here to upload.
(they will only be visible to you) -
- - - - - - - - - - - - - - - diff --git a/models/admin/dashboardWidget/index.php b/models/admin/dashboardWidget/index.php index d7840282..0142d911 100644 --- a/models/admin/dashboardWidget/index.php +++ b/models/admin/dashboardWidget/index.php @@ -148,6 +148,11 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $membersPending = $MemberInfo->getStats('status = '.$this->config['status_numb']['Pending']); + // Get member information records with bad or no lat/lon + $hideArchived = " T.status != ".$this->config['status_numb']['Archived']; + $badLatLonList = $MemberInfo->getSimpleMemberInfoList($hideArchived.' AND (T.lat = 0 OR T.lon = 0)'); + $haveBadLatLon = (count($badLatLonList) > 0); + // If there's members with pending information, list them $pendingList = false; if ($membersPending > 0) { @@ -159,6 +164,8 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers 'numbMembers' => $stats, 'membersList' => $membersList, 'membersPending' => $membersPending, + 'haveBadLatLon' => $haveBadLatLon, + 'badLatLonList' => $badLatLonList, 'haveMemberTypes' => $haveMemberTypes, 'haveCategories' => $haveCategories, 'haveAccommodationTypes' => $haveAccommodationTypes, diff --git a/models/admin/management/import.php b/models/admin/management/import.php index 396c2e13..f18b7c4c 100644 --- a/models/admin/management/import.php +++ b/models/admin/management/import.php @@ -827,12 +827,30 @@ class GlmMembersAdmin_management_import */ // Import Members + $numbMembersActive = 0; + $numbMembersInactive = 0; while (list ($key, $val) = each ($member) ) { + // Determine if member is active and set access accordingly + if ($val['active'] == 't') { + + // Member is active, so set to active-moderated + $access = $this->config['memb_access_numb']['Moderated']; + $numbMembersActive++; + + } else { + + // Member is not active, so set to no display no access + $access = $this->config['memb_access_numb']['NotDisplayed']; + $numbMembersInactive++; + + } + + // Add main member record $res = $this->wpdb->insert( GLM_MEMBERS_PLUGIN_DB_PREFIX.'members', array( - 'access' => $this->config['memb_access_numb']['Moderated'], + 'access' => $access, 'member_type' => $defaultMemberType, 'created' => date('Y-m-d'), 'name' => $val['member_name'], @@ -998,6 +1016,8 @@ class GlmMembersAdmin_management_import $templateData['numbStates'] = count($state); $templateData['numbRegions'] = count($region); $templateData['numbMembers'] = count($member); + $templateData['numbMembersActive'] = $numbMembersActive; + $templateData['numbMembersInactive'] = $numbMembersInactive; $templateData['numbCategories'] = count($catTrans); $templateData['numbCategoryMembers'] = count($membCat); $templateData['numbAmenities'] = count($amenity); diff --git a/models/admin/members/index.php b/models/admin/members/index.php index 58f1b7f0..e1bd5ac4 100644 --- a/models/admin/members/index.php +++ b/models/admin/members/index.php @@ -147,11 +147,16 @@ class GlmMembersAdmin_members_index extends GlmDataMembers $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $membersPending = $MemberInfo->getStats('status = '.$this->config['status_numb']['Pending']); + // Get member information records with bad or no lat/lon + $hideArchived = " T.status != ".$this->config['status_numb']['Archived']; + $badLatLonList = $MemberInfo->getSimpleMemberInfoList($hideArchived.' AND (T.lat = 0 OR T.lon = 0)'); + $haveBadLatLon = (count($badLatLonList) > 0); + // If there's members with pending information, list them $pendingList = false; if ($membersPending > 0) { - $pendingList = $MemberInfo->getList('status = '.$this->config['status_numb']['Pending']); + $pendingList = $MemberInfo->getSimpleMemberInfoList('status = '.$this->config['status_numb']['Pending']); } // Compile template data @@ -159,6 +164,8 @@ class GlmMembersAdmin_members_index extends GlmDataMembers 'numbMembers' => $stats, 'membersList' => $membersList, 'membersPending' => $membersPending, + 'haveBadLatLon' => $haveBadLatLon, + 'badLatLonList' => $badLatLonList, 'haveMemberTypes' => $haveMemberTypes, 'haveCategories' => $haveCategories, 'haveAccommodationTypes' => $haveAccommodationTypes, diff --git a/models/admin/members/list.php b/models/admin/members/list.php index 3c673596..6bd88f03 100644 --- a/models/admin/members/list.php +++ b/models/admin/members/list.php @@ -126,6 +126,28 @@ class GlmMembersAdmin_members_list extends GlmDataMembers $where .= " AND T.access != ".$this->config['memb_access_numb']['Archived']; } + // Get a list of categories for filtering + require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + $Categories = new GlmDataCategories($this->wpdb, $this->config); + $categories = $Categories->getListSortedParentChild(false); + + // Check if there is a category filter + if (isset($_REQUEST['filterCategory'])) { + $filterCat = ($_REQUEST['filterCategory'] - 0); + $where .= " AND T.id in ( + SELECT DISTINCT(I.member) + FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info I, + ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info M, + ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories C + WHERE I.id = M.member_info + AND ( + M.category = $filterCat + OR (C.parent = $filterCat AND M.category = C.id) + ) + )"; + } + + // Get a current list of members $list = $this->getList($where); @@ -173,9 +195,11 @@ class GlmMembersAdmin_members_list extends GlmDataMembers $templateData = array( 'haveMembers' => $haveMembers, 'members' => $list, + 'categories' => $categories, 'haveFilter' => $haveFilter, 'filterArchived' => $filterArchived, 'filterPending' => $filterPending, + 'filterCat' => $filterCat, 'filterName' => stripslashes($filterName) // 'canEdit' => $canEdit ); diff --git a/views/admin/dashboardWidget/index.html b/views/admin/dashboardWidget/index.html index 953e5f60..063bff3a 100644 --- a/views/admin/dashboardWidget/index.html +++ b/views/admin/dashboardWidget/index.html @@ -53,17 +53,33 @@ Number of Members Listed: List Members{$numbMembers} -{if $membersPending} +{if $haveBadLatLon}
-

Pending Member Information

+

Records with Bad Map Locations

- + + {assign var="i" value="0"} + {foreach $badLatLonList as $p} + {if $i++ is odd by 1} - - + {else} + + {/if} + - + {/foreach} + +
Member NameReference Name
+ {$p.member} +
+{/if} + +{if $membersPending} +
+

Pending Member Information

+ + {assign var="i" value="0"} {foreach $pendingList as $p} @@ -75,9 +91,6 @@ - {/foreach} diff --git a/views/admin/management/import/readDatabase.html b/views/admin/management/import/readDatabase.html index e3dc7788..59dc4752 100644 --- a/views/admin/management/import/readDatabase.html +++ b/views/admin/management/import/readDatabase.html @@ -13,6 +13,8 @@ + + diff --git a/views/admin/member/index.html b/views/admin/member/index.html index 09db9801..acdd2055 100644 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@ -82,23 +82,17 @@

 

-
-

Member Information Versions

+ Add New Member Information Version +
+

+

Member Information Versions

Show archived information  

-
- {if $haveMember} - {if $haveInfoRecords} - - Add New Member Information Version - - {if $noActive} -

There is no active information for this member.

- {/if} - +

+
{$p.member} - {$p.reference_name} -
States:{$numbStates}
Regions:{$numbRegions}
Members:{$numbMembers}
Members Active:{$numbMembersActive}
Members Inactive:{$numbMembersInactive}
Categories:{$numbCategories}
Member Category Entires:{$numbCategoryMembers}
Amenities:{$numbAmenities}
@@ -110,6 +104,10 @@ + + {if $haveMember} + {if $haveInfoRecords} + {assign var="i" value="0"} {foreach $memberInfoRecords as $m} {if $i++ is odd by 1} @@ -127,13 +125,12 @@ {/foreach} - -
{else} -

You do not yet have any member information entered.

-

Click here too start entering information for this member.

- {/if} + Click here too start entering information for this member. {/if} + + + {/if} {else}

You do not have any Member Types setup.

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 73db7e7e..1f87a456 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -558,8 +558,6 @@ - -