From 0904bd92532fbffe301dcafd49e000e39a41ad93 Mon Sep 17 00:00:00 2001 From: Matthew Dudley Date: Wed, 7 Oct 2015 11:30:34 -0600 Subject: [PATCH 01/18] First-Pass CSS Merge. Tabs have been replaced. I think git will take care of the CRs, so let's see --- admin.php | 11 +- ajax_htmldata.php | 2 +- css/style.css | 183 +++++++++++++++++++++++++-------- css/thickbox.css | 4 +- images/authpage.gif | Bin 7262 -> 6042 bytes images/authtitle.gif | Bin 6254 -> 4928 bytes images/bg-diagonal-stripes.png | Bin 0 -> 214 bytes images/bg-gray-texture.jpg | Bin 0 -> 44031 bytes images/favicon.ico | Bin 0 -> 1150 bytes images/login.gif | Bin 1417 -> 1487 bytes index.php | 7 +- 11 files changed, 154 insertions(+), 53 deletions(-) create mode 100644 images/bg-diagonal-stripes.png create mode 100644 images/bg-gray-texture.jpg create mode 100644 images/favicon.ico diff --git a/admin.php b/admin.php index 92ca9ce..a6f31bb 100644 --- a/admin.php +++ b/admin.php @@ -43,6 +43,7 @@ + @@ -56,24 +57,24 @@
-
+
-
+

-
Users
+
Users
* Login ID must match the login ID set up in the modules
-
+


Processing...
-
Login page
+
Login page
diff --git a/ajax_htmldata.php b/ajax_htmldata.php index 770798d..6ec2444 100644 --- a/ajax_htmldata.php +++ b/ajax_htmldata.php @@ -31,7 +31,7 @@ if (count($usersArray) > 0){ ?> - +
diff --git a/css/style.css b/css/style.css index 0225efc..8488d86 100644 --- a/css/style.css +++ b/css/style.css @@ -11,7 +11,9 @@ body { font-family: "arial"; font-size:0.99em; margin: 15px; - padding: 0 + padding: 0; + background-color: #f3f3f3; + background: #E7E8E8 url(../images/bg-gray-texture.jpg) repeat top left; } @@ -37,11 +39,21 @@ label{ input, select, multiple, textarea{ float: left; margin-top: 5px; + cursor: pointer; } +.submitButton { + color: #FFFFFF; + font-family: "Arial", sans-serif; + font-size: 11px; + font-weight: normal; + background: #1b76a9; + border: none; + padding: 5px 10px; + text-transform: capitalize; +} -.submitButton {color: #3D545D; font-family: "arial"; font-size: 95%; font-weight: medium;} textarea{ width: 250px; @@ -84,9 +96,21 @@ a.helpfulLink {color:#526972;} .smallerText{color:#3D545D;font-size:85%;} .redText{color:red} .smallRedText{font-size:85%;color:red;} -.darkRedText{color:#7a0026;} -.bigDarkRedText{font-size:125%; color:#7a0026;} -.smallDarkRedText{font-size:85%;color:#7a0026;} + +.darkRedText { + color: #CD0000; +} + +.bigDarkRedText { + font-size: 125%; + color: #CD0000; +} + +.smallDarkRedText { + font-size: 85%; + color: #CD0000; +} + .normalText{color:#3D545D} .smallBlueText{font-size:85%;font-weight:normal; color:#526972} .smallGreyText{font-size:85%;font-weight:normal; color:gray} @@ -105,13 +129,15 @@ select option { color: #3D545D; font-family: "arial"; font-size: 8pt; font-weigh div.formTitle { + width: auto !important; margin: 0; - padding: 2px 3px 2px 2px; + padding: 6px; border-width: 1px 0 0 0; border-style: solid; border-color: #e6e5e9; - background-color: #e9edf0; + background-color: #cad7e1; -moz-border-radius: 0px; + background: rgba(200, 200, 200, 0.5) url(../images/bg-diagonal-stripes.png) repeat top left !important; } @@ -131,6 +157,7 @@ table.surroundBox { border-collapse: collapse; border-spacing: 0; font-size:100%; + width: 100% !important; } table.surroundBox td { @@ -178,14 +205,14 @@ table.noBorder td { border:0; } div.bordered { -border-bottom: 1px solid #adc6de; -border-left: 1px solid #adc6de; -border-right: 1px solid #adc6de; -background: white; -margin:0px; -padding:0px; +border-bottom: 1px solid #5295ba ; +border-left: 1px solid #5295ba ; +border-right: 1px solid #5295ba ; +background: none; +margin: 0px; +padding: 0px; color: #3D545D; -border-spacing:0px; +border-spacing: 0px; } @@ -230,56 +257,126 @@ border-collapse: collapse; background: white; } +.adminRightHeader{font-size:115%; font-weight:bold; color:#3D545D; margin-bottom:5px; } +table.linedDataTable { + /*-*/border-width: 1px; + border-style: solid; + /*-*/border-color: #e6e5e9; + border-collapse: collapse; + border-spacing: 0; + font-size:95%; + margin-bottom:5px; +} +table.linedDataTable td { + margin: 0; + /*-*/padding: 6px; + /*-*/border-width: 1px; + border-style: solid; + border-color: #e6e5e9; + background-color: white; + -moz-border-radius: 0px; +} +table.linedDataTable td.complete { + background-color: #f4f4f4; +} -.adminRightHeader{font-size:115%; font-weight:bold; color:#3D545D; margin-bottom:5px; } +table.linedDataTable th { + margin: 0; + /*-*/padding: 6px; + border-width: 1px; + border-style: solid; + border-color: #e9edf0; + background-color: #e9edf0; + -moz-border-radius: 0px; + /*-*/background: rgba(200, 200, 200, 0.5) url(../images/bg-diagonal-stripes.png) repeat top left !important; +} +table.linedDataTable tr { + vertical-align:top; +} +/*--- Additional Custom CSS ---*/ -table.linedDataTable { - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: #e6e5e9; - border-collapse: collapse; - border-spacing: 0; - font-size:95%; - margin-bottom:5px; +label:nth-of-type(3) { + margin-top: 5px; } -table.linedDataTable td { - margin: 0; - padding: 3px 3px 3px 3px; - border-width: 1px 0 0 0; - border-style: solid; - border-color: #e6e5e9; - background-color: white; - -moz-border-radius: 0px; +.smallerText a:hover { + color: #ccc; } -table.linedDataTable td.complete { - background-color: #f4f4f4; +/*--- New Custom CSS ---*/ + +#login-form { + margin-top: 20px; } +#login-form label:nth-of-type(1) { + margin: 110px 0 15px 0 !important; + text-align: center !important; +} -table.linedDataTable th { - margin: 0; - padding: 2px 3px 2px 2px; - border-width: 1px 0 0 0; - border-style: solid; - border-color: #e6e5e9; - background-color: #f6f8fa; - -moz-border-radius: 0px; +a#admin-link:before { + font-family: FontAwesome; + content: "\f023"; + font-size: 13px; + margin-right: 5px; } -table.linedDataTable tr { - vertical-align:top; +a#admin-link { + text-decoration: none; + text-transform: capitalize; + font-size: 14px; +} + +a#admin-link:hover { + color: #ccc; +} + +a#login-link:before { + font-family: FontAwesome; + content: "\f007"; + font-size: 13px; + margin-right: 5px; +} + +a#login-link { + text-decoration: none; + text-transform: capitalize; + font-size: 14px; } +a#login-link:hover { + color: #ccc; +} +#loginbutton { + margin-top: 13px !important; +} +/*--- Custom CSS ---*/ +a#addUser:before { + font-family: FontAwesome; + content: "\f055"; + font-size: 11px; + margin-right: 5px; +} +a#addUser { + text-decoration: none; + text-transform: capitalize; + font-size: 12px; +} +a#addUser:hover { + color: #ccc; +} + +.bordered .smallDarkRedText { + margin-bottom: 10px !important; +} diff --git a/css/thickbox.css b/css/thickbox.css index f3cff58..f47142b 100644 --- a/css/thickbox.css +++ b/css/thickbox.css @@ -114,7 +114,9 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d } #TB_ajaxContent.TB_modal{ - padding:15px; + padding: 15px; + width: auto !important; + height: auto !important; } #TB_ajaxContent p{ diff --git a/images/authpage.gif b/images/authpage.gif index 5dd857117a7fb43b3c1e97a902cf380cba4525fe..de526e619ba0b283566f38dacbc3b6b81149de33 100644 GIT binary patch literal 6042 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 Uc%S!rzxRCK_kREP4iOLlJFGDbQUCw| literal 7262 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 diff --git a/images/authtitle.gif b/images/authtitle.gif index 2ce3fb8d0bbb809b11b1a384e4d8c668035befe9..9a9b15ca63328907abd59d16caa5fb1f00335a7b 100644 GIT binary patch literal 4928 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 literal 6254 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 diff --git a/images/bg-diagonal-stripes.png b/images/bg-diagonal-stripes.png new file mode 100644 index 0000000000000000000000000000000000000000..e94c385caa72860a15b4c0fcc64d511332fc9ed7 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XDm+~rLn>}1r8%%3ayY|rWPhd#A6rZSYl!glLrN!oTnpLE zWb_tvSqKaKclsn`v|yTr*Aauu0Wx|gU7ZVmEmg|u>R+~K;)Jdv1raWyg#i(N*^}%P z{`IN3136m1+LXVoRJEJcW2dX00o}mh>FVdQ I&MBb@0DFr_TmS$7 literal 0 HcmV?d00001 diff --git a/images/bg-gray-texture.jpg b/images/bg-gray-texture.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ef0afea753467848066e42ed791927baebe5bd9a GIT binary patch literal 44031 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 literal 0 HcmV?d00001 diff --git a/images/login.gif b/images/login.gif index ba12376810e21c1168add555aee56956d2e98e2d..7f55239aa2e4b4d16262c34783efc532f025710f 100644 GIT binary patch literal 1487 zcmZ?wbhEHbY-W&S*v!BX7Z-Q_{P~)in)U0~@7lF%`t<3KA3y%~?c33#M{nM|xp?v7 zyu7@wuCBLl-~Rvq-`Cey@jrKjZ-9bJVo4&9wz01$NKDR7Em25HP0!4;ReHaBzmh^` zimg((sjq==fpcm`rbks#YH*cbNODznvSo^ry`6$hg;hmvL2hbEqC!P(PF}H9g{@Lz zN`6wR6_5=Q)>l#hD=EpgRdNJLD1hvA&M!(;Fx4~FO*SwxR4}*HGc+}^G&IyvFfuSS z);BcJH?q_er{{GxPy zLrY6beFGzXBO_g)3fZE`@j@ zx4_pIZg5_)9@s;A$@#hZ6^RAz*Q}aqZU2K(rGI}YQDOPEg7DkpS$tk)? z$%!etCW%IAx=F@qCc36csmbQXMivI9i6$^}u<182Hg+>KGc|QFb+a%ubTx4@v@o?a zcQG|Hwlp^}H8Ftc^~@_SNz6-5h1s16v>U3|1g~Bz=c3falKi5O{QMkPDhSBPFUc>? z$S+WEc2>~vO-#NJFPuMj_RQ&1Cr=zdcJ#>MLkAD+-?w+q?p-@~Y~QwZ%jQiRH>_W`cFpQl zD_1OEwsgtjMGF_qpEq~T>{&BsOrJJ&%H&BCC-nFA_H=i3cC@#(wlp_2Hq_VE)>Kzj zR+N{OmJ}Bi7UbvU=45AOW~8U3rX(jNCd9|Z#zaR&Mudljh6D!%2Kf8=`gnVJdbqo} zx;Q&II@sIU+E`mzT9})eniv}aGpL@fj<%MjhPs-nin5ZTg1nrpjI@-bgt(Zfh_H~L z06!lu4>uPl2Rj=p3o{cV1B2pE76uT|0TG}Ai-G0;hm)SG_gcI@yZe8FMqf(iyo^=r za$fH%&^cd{d%t4c`l=#edn!Nexqtt?=EwTB zBb#zw8a?!uaQ}Jh?c?b!qKC`b`KDAZNH~4C{M8qY9Y69IWZ60SXB5bIZd!73vPST# K7)>Q625SI^w=>)T literal 1417 zcmV;41$O#JNk%w1VS@l30OkMyOdoBi+U4-rfpzmDAzw+U4iPTqr?tR>k(_3Ae1?>srLeeLX>sxO z`H`Qg&)w|b>GEiHeY(caaDRtyeuwAp_KBCDue-$i{QX2zT2^Lndy13C*XXRd!nD4| zo2j+O(%W=_iBDc-bb^Vw$kkhFajw0}(%t92%-G4(+l`r_z|h~by~U57sbO(?%h=;k zUuBP)qIZXpf{vDsnxV(l+$&L@Av2K_UZ8V$k^%1+Um*K>Fx9RA^8LV00000EC2ui z0D}M?000O7fDeK`1VDF(h>41ejE#07;-m)axAU4xVgH!yDV}K8Y_0g#Kp$P$jQpf%+1cv(8wzq7;|{n*xB0K+}+;a z;Njxq}5{Qds_00RmfNU)&6g9sB2?9)e&!-o(f zN}NcsqQ#3CGiuyeks+LqAVZ2ANwOr!Cl17zTxn8<1C}sj$|Tvx#+;itbL!m5vnS3j z4$Al(>XVENqDYe}cRfyP-HDk2EsL85||vMAn`t$;!S3Lz1AuwBf!G1{>UB1@i3xw7TUl94zl zVHt&k2qjd22!kbZ6c8X(lu)9?0g}iO97z5wF&3p3L1i*s}A5Ofu@!&Hy z6F=cVMDQUFqyQJ;U=BS~C1@!3Sk3a?~EkUqKr1`=%bJ>ih~0?IQoMFKQNj>28w1d zff|bL@Es0{Lg2un4nV+Ys*$$p>Z^<*+Q6)|)@tjmxaLah2dQ4*tFKu!0KfzvG+;&% z4nQ$0uc>;9Y_ScPN^7dMQmgB=*k(&B9~>~??YH2DEAF`Derv*a=zeDc17=u&?gUxfo3l5-R z@x~l?Y;hfR#3Ay?B$sUR$tb6+GRbFzqRd zE#xr91QT2l^wLZ>y>uOS2q5*;R99{F)mUe(HPu|O@x>BL}|72SaSP z?e^Pn$1V5Vbk}Y7-FV0CM-49AG1lLJ2QK*Fgcol3;fN=$_~L}$;lcw!G=b>klvi%~ z<(Ox#`R1H=?)m4IHxWc8FB}5$>8Pi!`s%E=?)vMn$1eNqARqEVCW0iPfgHT|?)&e+ X2QU2a#20V;@yI7HhXzSx5(of0PV@*b diff --git a/index.php b/index.php index b9c2425..b7a449c 100644 --- a/index.php +++ b/index.php @@ -167,7 +167,8 @@ CORAL Authentication - + + @@ -181,7 +182,7 @@
-

+

@@ -198,7 +199,7 @@
-
Admin page
+
Admin page
From 4d8a955a39e272f89a7d9df8f7ab4b15d5aea960 Mon Sep 17 00:00:00 2001 From: "david.rappleye" Date: Tue, 10 Nov 2015 11:57:24 -0700 Subject: [PATCH 02/18] CAMP-786 Removed the fish icons --- images/clownfishfavicon.ico | Bin 1406 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/clownfishfavicon.ico diff --git a/images/clownfishfavicon.ico b/images/clownfishfavicon.ico deleted file mode 100644 index 2303b02166ad7db9ab192cdd315204602c73b315..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmeH^do0yq7{|ZAL{#pPYpz8{NaPf9t3x%w8m=zs39hA$;I>VnQ^90-g|x7EBX=aSkOFZ_qU;03-S|%w0IJ44HyhI1gyqK|f{~>hu%{rxzfe97R$2 z1Jv;vVH`h$2$vEylya%EZb3P>AC4)*$jH8d%IZF7Moi&#TNmnupE2-p1~p9* z42u?!ev1Pq?+|cm$-8uSB0Hb==RH@{$_D;p1Ju7(#L<1rMs}>T&{Otu(xE&k~74od^q-5Ts<8-=}gn~zy0NCOiGP51puTa(;2(hf>JDd#Y6|q6@mwu$&}Ci1c!|A AIRF3v From 29b717f4ebd267c304320a1315c775a16270f5fd Mon Sep 17 00:00:00 2001 From: "david.rappleye" Date: Fri, 13 Nov 2015 09:51:59 -0700 Subject: [PATCH 03/18] CAMP-786 Updated the favicon links --- admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin.php b/admin.php index a6f31bb..46fe0f1 100644 --- a/admin.php +++ b/admin.php @@ -42,7 +42,7 @@ CORAL Authentication - + From 92d0f55962207127ff60f54439725df87c3a18e0 Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Mon, 14 Mar 2016 11:03:09 -0600 Subject: [PATCH 04/18] Merged localization functionality (French) into our branch --- .gitignore | 2 +- .htaccess | 4 +- LangCodes.php | 22 + admin.php | 94 +- admin/.htaccess | 2 +- admin/classes/common/Configuration.php | 62 +- admin/classes/common/DBService.php | 197 ++-- admin/classes/common/DatabaseObject.php | 596 +++++------ admin/classes/common/DynamicObject.php | 92 +- admin/classes/common/Email.php | 182 ++-- admin/classes/common/LdapPerson.php | 126 +-- admin/classes/common/NamedArguments.php | 106 +- admin/classes/common/Object.php | 176 ++-- admin/classes/common/Utility.php | 314 +++--- admin/classes/domain/Session.php | 62 +- admin/classes/domain/User.php | 446 ++++---- admin/configuration_sample.ini | 40 +- ajax_forms.php | 48 +- ajax_htmldata.php | 10 +- ajax_processing.php | 4 +- css/style.css | 2 +- css/thickbox.css | 334 +++--- directory.php | 15 + index.php | 109 +- install/index.php | 133 ++- install/js/index.js | 7 + install/js/jquery.js | 5 + js/admin.js | 57 +- js/index.js | 7 +- js/plugins/Gettext.js | 1265 +++++++++++++++++++++++ js/plugins/jquery.js | 334 +++--- js/plugins/thickbox.js | 678 ++++++------ locale/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 4937 bytes locale/fr_FR/LC_MESSAGES/messages.po | 264 +++++ 34 files changed, 3810 insertions(+), 1985 deletions(-) create mode 100644 LangCodes.php create mode 100644 install/js/index.js create mode 100644 install/js/jquery.js create mode 100644 js/plugins/Gettext.js create mode 100644 locale/fr_FR/LC_MESSAGES/messages.mo create mode 100644 locale/fr_FR/LC_MESSAGES/messages.po diff --git a/.gitignore b/.gitignore index d7aecb9..5f0a515 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -admin/configuration.ini +admin/configuration.ini diff --git a/.htaccess b/.htaccess index 6447bd2..5a5c87f 100644 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,3 @@ -# Other restrictions -Order Allow,Deny +# Other restrictions +Order Allow,Deny Allow from all \ No newline at end of file diff --git a/LangCodes.php b/LangCodes.php new file mode 100644 index 0000000..1f51904 --- /dev/null +++ b/LangCodes.php @@ -0,0 +1,22 @@ +'fr_FR', + 'en'=>'en_US' + ); + return $all_lang[$code]; + } + public function getNameLang($code_lang){ + $name_lang=array( + 'fr'=>_('French'), + 'en'=>_('English') + ); + return $name_lang[$code_lang]; + } +} +?> \ No newline at end of file diff --git a/admin.php b/admin.php index 46fe0f1..bb2b792 100644 --- a/admin.php +++ b/admin.php @@ -24,12 +24,10 @@ if (isset($_SESSION['loginID'])){ $loginID=$_SESSION['loginID']; + $user = new User(new NamedArguments(array('primaryKey' => $loginID))); } -$user = new User(new NamedArguments(array('primaryKey' => $loginID))); - - -if (($user->isAdmin) && ($user->getOpenSession())){ +if (isset($user) && ($user->isAdmin) && ($user->getOpenSession())){ ?> @@ -47,9 +45,24 @@ + +getLanguage($str); + if($default_l==null || empty($default_l)){$default_l=$str;} + if(isset($_COOKIE["lang"])){ + if($_COOKIE["lang"]==$http_lang && $_COOKIE["lang"] != "en_US"){ + echo ""; + } + }else if($default_l==$http_lang && $default_l != "en_US"){ + echo ""; + } +?> - +
@@ -63,18 +76,59 @@

-
Users
-
* Login ID must match the login ID set up in the modules
+
+
*


- Processing... +
- -
Login page
+
+

+ +
+
@@ -87,7 +141,23 @@


- + @@ -98,7 +168,7 @@ }else{ - if ($user->getOpenSession()){ + if (isset($user) && $user->getOpenSession()){ header('Location: index.php?service=admin.php&invalid'); }else{ header('Location: index.php?service=admin.php&admin'); diff --git a/admin/.htaccess b/admin/.htaccess index f239fe8..fb3b538 100644 --- a/admin/.htaccess +++ b/admin/.htaccess @@ -1,2 +1,2 @@ -order deny,allow +order deny,allow deny from all \ No newline at end of file diff --git a/admin/classes/common/Configuration.php b/admin/classes/common/Configuration.php index 71f46c9..28006a5 100644 --- a/admin/classes/common/Configuration.php +++ b/admin/classes/common/Configuration.php @@ -1,32 +1,32 @@ -. -** -************************************************************************************************************************** -*/ - - -class Configuration extends DynamicObject { - - public function init(NamedArguments $arguments) { - $arguments->setDefaultValueForArgumentName('filename', BASE_DIR . '/admin/configuration.ini'); - $config = parse_ini_file($arguments->filename, true); - foreach ($config as $section => $entries) { - $this->$section = Utility::objectFromArray($entries); - } - } - -} - +. +** +************************************************************************************************************************** +*/ + + +class Configuration extends DynamicObject { + + public function init(NamedArguments $arguments) { + $arguments->setDefaultValueForArgumentName('filename', BASE_DIR . '/admin/configuration.ini'); + $config = parse_ini_file($arguments->filename, true); + foreach ($config as $section => $entries) { + $this->$section = Utility::objectFromArray($entries); + } + } + +} + ?> \ No newline at end of file diff --git a/admin/classes/common/DBService.php b/admin/classes/common/DBService.php index 563e00b..9dbfe31 100644 --- a/admin/classes/common/DBService.php +++ b/admin/classes/common/DBService.php @@ -1,92 +1,105 @@ -. -** -************************************************************************************************************************** -*/ - - -class DBService extends Object { - - protected $db; - protected $config; - protected $error; - - protected function init(NamedArguments $arguments) { - parent::init($arguments); - $this->config = new Configuration; - $this->connect(); - } - - protected function dealloc() { - $this->disconnect(); - parent::dealloc(); - } - - protected function checkForError() { - if ($this->error = mysqli_error($this->db)) { - throw new Exception("There was a problem with the database: " . $this->error); - } - } - - protected function connect() { - $host = $this->config->database->host; - $username = $this->config->database->username; - $password = $this->config->database->password; - $databaseName = $this->config->database->name; - $this->db = mysqli_connect($host, $username, $password, $databaseName); - $this->checkForError(); - } - - - protected function disconnect() { - //mysqli_close($this->db); - } - - - public function changeDB($databaseName) { - //$databaseName='coral_reporting_pprd'; - mysqli_select_db($this->db, $databaseName); - $this->checkForError(); - } - - public function processQuery($sql, $type = NULL) { - //echo $sql. "
"; - $result = mysqli_query($this->db, $sql); - $this->checkForError(); - $data = array(); - - if ($result instanceof mysqli_result) { - $resultType = MYSQLI_NUM; - if ($type == 'assoc') { - $resultType = MYSQLI_ASSOC; - } - while ($row = mysqli_fetch_array($result, $resultType)) { - if (mysqli_affected_rows($this->db) > 1) { - array_push($data, $row); - } else { - $data = $row; - } - } - mysqli_free_result($result); - } else if ($result) { - $data = mysqli_insert_id($this->db); - } - - return $data; - } - -} - -?> +. +** +************************************************************************************************************************** +*/ + + +class DBService extends Object { + + protected $db; + protected $config; + protected $error; + + protected function init(NamedArguments $arguments) { + parent::init($arguments); + $this->config = new Configuration; + $this->connect(); + } + + protected function dealloc() { + $this->disconnect(); + parent::dealloc(); + } + + protected function checkForError() { + if ($this->error = mysqli_error($this->db)) { + throw new Exception(_("There was a problem with the database: ") . $this->error); + } + } + + protected function connect() { + $host = $this->config->database->host; + $username = $this->config->database->username; + $password = $this->config->database->password; + $databaseName = $this->config->database->name; + $this->db = mysqli_connect($host, $username, $password, $databaseName); + $this->checkForError(); + $this->db->set_charset('utf8'); + } + + protected function disconnect() { + //$this->db->close(); + } + + public function changeDB($databaseName) { + //$databaseName='coral_reporting_pprd'; + $this->db->select_db($databaseName); + $this->checkForError(); + } + + public function escapeString($value) { + return $this->db->escape_string($value); + } + + public function getDatabase() { + return $this->db; + } + + public function query($sql) { + $result = $this->db->query($sql); + $this->checkForError(); + return $result; + } + + public function processQuery($sql, $type = NULL) { + //echo $sql. "
"; + $result = $this->db->query($sql); + $this->checkForError(); + $data = array(); + + if ($result instanceof mysqli_result) { + $resultType = MYSQLI_NUM; + if ($type == 'assoc') { + $resultType = MYSQLI_ASSOC; + } + while ($row = $result->fetch_array($resultType)) { + if ($this->db->affected_rows > 1) { + array_push($data, $row); + } else { + $data = $row; + } + } + $result->free(); + } else if ($result) { + $data = $this->db->insert_id; + } + + return $data; + } + +} + +?> diff --git a/admin/classes/common/DatabaseObject.php b/admin/classes/common/DatabaseObject.php index 917d3bb..ef9b0de 100644 --- a/admin/classes/common/DatabaseObject.php +++ b/admin/classes/common/DatabaseObject.php @@ -1,299 +1,299 @@ -. -** -************************************************************************************************************************** -*/ - - -class DatabaseObject extends DynamicObject { - - protected $db; - - protected $tableName; - protected $collectiveName; - - protected $primaryKeyName; - protected $primaryKey; - - public $attributeNames = array(); - protected $attributes = array(); - - protected $childNames = array(); - protected $children = array(); - - protected $parentNames = array(); - protected $parents = array(); - - protected $peerNames = array(); - protected $peers = array(); - - protected function init(NamedArguments $arguments) { - $arguments->setDefaultValueForArgumentName('tableName', get_class($this)); - $this->tableName = $arguments->tableName; - - $defaultCollectiveName = lcfirst($arguments->tableName) . 's'; - $arguments->setDefaultValueForArgumentName('collectiveName', $defaultCollectiveName); - $this->collectiveName = $arguments->collectiveName; - - $defaultPrimaryKeyName = lcfirst($arguments->tableName) . 'ID'; - $arguments->setDefaultValueForArgumentName('primaryKeyName', $defaultPrimaryKeyName); - $this->primaryKeyName = $arguments->primaryKeyName; - - $this->primaryKey = $arguments->primaryKey; - $this->db = new DBService; - $this->defineRelationships(); - //$this->defineAttributes(); - $this->overridePrimaryKeyName(); - $this->load(); - - - } - - protected function defineRelationships() {} - protected function overridePrimaryKeyName() {} - - - protected function defineAttributes() { - // Figure out attributes from existing database - $query = "SELECT COLUMN_NAME FROM information_schema.`COLUMNS` WHERE table_schema = '"; - $query .= $this->db->config->database->name . "' AND table_name = '$this->tableName'";// MySQL-specific - foreach ($this->db->processQuery($query) as $result) { - $attributeName = $result[0]; - if ($attributeName != $this->primaryKeyName) { - $this->addAttribute($attributeName); - } - } - } - - protected function addAttribute($attributeName, $attributeType = NULL) { - $this->attributeNames[$attributeName] = $attributeType; - } - - protected function hasMany($relatedClassName) { - $exampleRelatedObject = new $relatedClassName; - $nameArrayName = 'childNames'; - // Check for many-to-many relationship. - if (array_key_exists($this->collectiveName, $exampleRelatedObject->childNames)) { - $nameArrayName = 'peerNames'; - } - $this->$nameArrayName[$exampleRelatedObject->collectiveName] = $relatedClassName; - } - - protected function hasOne($parentClassName, $parentName = NULL) { - if (!isset($parentName)) { - $parentName = lcfirst($parentClassName); - } - $this->parentNames[$parentName] = $parentClassName; - } - - public function valueForKey($key) { - if (array_key_exists($key, $this->attributeNames)) { - if (!array_key_exists($key, $this->attributes)) { - $query = "SELECT `$key` FROM `$this->tableName` WHERE `$this->primaryKeyName` = '$this->primaryKey' LIMIT 1"; - $result = $this->db->processQuery($query); - if (isset($result[0])) $this->attributes[$key] = stripslashes($result[0]); - } - return $this->attributes[$key]; - } else if (array_key_exists($key, $this->parentNames)) { - if (!array_key_exists($key, $this->parents)) { - $parentClassName = $this->parentNames[$key]; - $exampleParent = new $parentClassName; - $parentPrimaryKey = $this->valueForKey($exampleParent->primaryKeyName); - $this->parents[$key] = new $parentClassName(new NamedArguments(array('primaryKey' => $parentPrimaryKey))); - } - return $this->parents[$key]; - } else if (array_key_exists($key, $this->childNames)) { - if (!array_key_exists($key, $this->children)) { - $this->children[$key] = array(); - $childClassName = $this->childNames[$key]; - $exampleChild = new $childClassName; - $whereClause = "`$this->primaryKeyName`='$this->primaryKey'"; - $query = "SELECT `$exampleChild->primaryKeyName` FROM `$exampleChild->tableName` WHERE $whereClause"; - $results = $this->db->processQuery($query); - foreach ($results as $result) { - $id = $result[0]; - $child = new $childClassName(new NamedArguments(array('primaryKey' => $id))); - array_push($this->children[$key], $child); - } - } - return $this->children[$key]; - } else if (array_key_exists($key, $this->peerNames)) { - if (!array_key_exists($key, $this->peers)) { - $this->peers[$key] = array(); - $peerClassName = $this->peerNames[$key]; - $examplePeer = new $peerClassName; - $whereClause = "`$this->primaryKeyName`='$this->primaryKey'"; - $tableNames = array($this->tableName, $examplePeer->tableName); - $sortedTableNames = sort($tableNames); - $joinTableName = $sortedTableNames[0] . 'To' . $sortedTableNames[1]; - $query = "SELECT `$examplePeer->primaryKeyName` FROM `$joinTableName` WHERE $whereClause"; - $results = $this->db->processQuery($query); - foreach ($results as $result) { - $id = $result[0]; - $peer = new $peerClassName(new NamedArguments(array('primaryKey' => $id))); - array_push($this->peers[$key], $peer); - } - } - return $this->peers[$key]; - } else { - return parent::valueForKey($key); - } - } - - public function setValueForKey($key, $value) { - if (array_key_exists($key, $this->parentNames)) { - if (is_a($value, 'DatabaseObject')) { - $key = $value->primaryKeyName; - $value = $value->primaryKey; - } - } - if (array_key_exists($key, $this->attributeNames)) { - $this->attributes[$key] = $value; - } else if (array_key_exists($key, $this->childNames) && is_array($value)) { - if (!array_key_exists($key, $this->children)) { - $this->children[$key] = array(); - } - //Add new children - foreach ($value as $child) { - if (is_a($child, $this->childNames[$key]) && is_a($child, 'DatabaseObject')) { - if (!array_key_exists($child->primaryKey, $this->children[$key])) { - $this->children[$key][$child->primaryKey] = $child; - } - } - } - //Remove old children - foreach (array_keys($this->children[$key]) as $childPrimaryKey) { - if (!array_key_exists($childPrimaryKey, $value)) { - unset($this->children[$key][$childPrimaryKey]); - } - } - } else if (array_key_exists($key, $this->peerNames) && is_array($value)) { - if (!array_key_exists($key, $this->peers)) { - $this->peers[$key] = array(); - } - //Add new peers - foreach ($value as $peer) { - if (is_a($peer, $this->peerNames[$key]) && is_a($peer, 'DatabaseObject')) { - if (!array_key_exists($peer->primaryKey, $this->peers[$key])) { - $this->peers[$key][$peer->primaryKey] = $peer; - } - } - } - //Remove old peers - foreach (array_keys($this->peers[$key]) as $peerPrimaryKey) { - if (!array_key_exists($peerPrimaryKey, $value)) { - unset($this->peers[$key][$peerPrimaryKey]); - } - } - } else { - parent::setValueForKey($key, $value); - } - } - - public function delete() { - $query = "DELETE FROM `$this->tableName` WHERE `$this->primaryKeyName` = '$this->primaryKey'"; - return $this->db->processQuery($query); - } - - public function save() { - $pairs = array(); - foreach (array_keys($this->attributeNames) as $attributeName) { - $value = $this->attributes[$attributeName]; - if (!isset($value)) { - $value = "NULL"; - } else { - $value = addslashes($value); - $value = "'$value'"; - } - $pair = "`$attributeName`=$value"; - array_push($pairs, $pair); - } - $set = implode(', ', $pairs); - if (isset($this->primaryKey)) { - // Update object - $query = "UPDATE `$this->tableName` SET $set WHERE `$this->primaryKeyName` = '$this->primaryKey'"; - $this->db->processQuery($query); - } else { - // Insert object - $query = "INSERT INTO `$this->tableName` SET $set"; - $this->primaryKey = $this->db->processQuery($query); - } - } - - - public function all() { - $query = "SELECT * FROM `$this->tableName` ORDER BY 2, 1"; - $result = $this->db->processQuery($query); - $objects = array(); - foreach ($result as $row) { - $className = get_class($this); - $object = new $className(new NamedArguments(array('primaryKey' => $row[0]))); - array_push($objects, $object); - } - - return $objects; - } - - - public function allAsArray() { - $query = "SELECT * FROM `$this->tableName` ORDER BY 2, 1"; - $result = $this->db->processQuery($query, 'assoc'); - - $resultArray = array(); - $rowArray = array(); - - if (isset($result[lcfirst($this->tableName) . 'ID'])){ - foreach (array_keys($result) as $attributeName) { - $rowArray[$attributeName] = $result[$attributeName]; - } - array_push($resultArray, $rowArray); - }else{ - foreach ($result as $row) { - foreach (array_keys($this->attributeNames) as $attributeName) { - $rowArray[$attributeName] = $row[$attributeName]; - } - array_push($resultArray, $rowArray); - } - } - - return $resultArray; - } - - - public function load() { - //if exists in the database - if (isset($this->primaryKey)) { - $query = "SELECT * FROM `$this->tableName` WHERE `$this->primaryKeyName` = '$this->primaryKey'"; - $result = $this->db->processQuery($query, 'assoc'); - - foreach (array_keys($result) as $attributeName) { - $this->addAttribute($attributeName); - $this->attributes[$attributeName] = $result[$attributeName]; - } - }else{ - // Figure out attributes from existing database - $query = "SELECT COLUMN_NAME FROM information_schema.`COLUMNS` WHERE table_schema = '"; - $query .= $this->db->config->database->name . "' AND table_name = '$this->tableName'";// MySQL-specific - foreach ($this->db->processQuery($query) as $result) { - $attributeName = $result[0]; - $this->addAttribute($attributeName); - } - - } - } - -} - +. +** +************************************************************************************************************************** +*/ + + +class DatabaseObject extends DynamicObject { + + protected $db; + + protected $tableName; + protected $collectiveName; + + protected $primaryKeyName; + protected $primaryKey; + + public $attributeNames = array(); + protected $attributes = array(); + + protected $childNames = array(); + protected $children = array(); + + protected $parentNames = array(); + protected $parents = array(); + + protected $peerNames = array(); + protected $peers = array(); + + protected function init(NamedArguments $arguments) { + $arguments->setDefaultValueForArgumentName('tableName', get_class($this)); + $this->tableName = $arguments->tableName; + + $defaultCollectiveName = lcfirst($arguments->tableName) . 's'; + $arguments->setDefaultValueForArgumentName('collectiveName', $defaultCollectiveName); + $this->collectiveName = $arguments->collectiveName; + + $defaultPrimaryKeyName = lcfirst($arguments->tableName) . 'ID'; + $arguments->setDefaultValueForArgumentName('primaryKeyName', $defaultPrimaryKeyName); + $this->primaryKeyName = $arguments->primaryKeyName; + + $this->primaryKey = $arguments->primaryKey; + $this->db = new DBService; + $this->defineRelationships(); + //$this->defineAttributes(); + $this->overridePrimaryKeyName(); + $this->load(); + + + } + + protected function defineRelationships() {} + protected function overridePrimaryKeyName() {} + + + protected function defineAttributes() { + // Figure out attributes from existing database + $query = "SELECT COLUMN_NAME FROM information_schema.`COLUMNS` WHERE table_schema = '"; + $query .= $this->db->config->database->name . "' AND table_name = '$this->tableName'";// MySQL-specific + foreach ($this->db->processQuery($query) as $result) { + $attributeName = $result[0]; + if ($attributeName != $this->primaryKeyName) { + $this->addAttribute($attributeName); + } + } + } + + protected function addAttribute($attributeName, $attributeType = NULL) { + $this->attributeNames[$attributeName] = $attributeType; + } + + protected function hasMany($relatedClassName) { + $exampleRelatedObject = new $relatedClassName; + $nameArrayName = 'childNames'; + // Check for many-to-many relationship. + if (array_key_exists($this->collectiveName, $exampleRelatedObject->childNames)) { + $nameArrayName = 'peerNames'; + } + $this->$nameArrayName[$exampleRelatedObject->collectiveName] = $relatedClassName; + } + + protected function hasOne($parentClassName, $parentName = NULL) { + if (!isset($parentName)) { + $parentName = lcfirst($parentClassName); + } + $this->parentNames[$parentName] = $parentClassName; + } + + public function valueForKey($key) { + if (array_key_exists($key, $this->attributeNames)) { + if (!array_key_exists($key, $this->attributes)) { + $query = "SELECT `$key` FROM `$this->tableName` WHERE `$this->primaryKeyName` = '$this->primaryKey' LIMIT 1"; + $result = $this->db->processQuery($query); + if (isset($result[0])) $this->attributes[$key] = stripslashes($result[0]); + } + return $this->attributes[$key]; + } else if (array_key_exists($key, $this->parentNames)) { + if (!array_key_exists($key, $this->parents)) { + $parentClassName = $this->parentNames[$key]; + $exampleParent = new $parentClassName; + $parentPrimaryKey = $this->valueForKey($exampleParent->primaryKeyName); + $this->parents[$key] = new $parentClassName(new NamedArguments(array('primaryKey' => $parentPrimaryKey))); + } + return $this->parents[$key]; + } else if (array_key_exists($key, $this->childNames)) { + if (!array_key_exists($key, $this->children)) { + $this->children[$key] = array(); + $childClassName = $this->childNames[$key]; + $exampleChild = new $childClassName; + $whereClause = "`$this->primaryKeyName`='$this->primaryKey'"; + $query = "SELECT `$exampleChild->primaryKeyName` FROM `$exampleChild->tableName` WHERE $whereClause"; + $results = $this->db->processQuery($query); + foreach ($results as $result) { + $id = $result[0]; + $child = new $childClassName(new NamedArguments(array('primaryKey' => $id))); + array_push($this->children[$key], $child); + } + } + return $this->children[$key]; + } else if (array_key_exists($key, $this->peerNames)) { + if (!array_key_exists($key, $this->peers)) { + $this->peers[$key] = array(); + $peerClassName = $this->peerNames[$key]; + $examplePeer = new $peerClassName; + $whereClause = "`$this->primaryKeyName`='$this->primaryKey'"; + $tableNames = array($this->tableName, $examplePeer->tableName); + $sortedTableNames = sort($tableNames); + $joinTableName = $sortedTableNames[0] . 'To' . $sortedTableNames[1]; + $query = "SELECT `$examplePeer->primaryKeyName` FROM `$joinTableName` WHERE $whereClause"; + $results = $this->db->processQuery($query); + foreach ($results as $result) { + $id = $result[0]; + $peer = new $peerClassName(new NamedArguments(array('primaryKey' => $id))); + array_push($this->peers[$key], $peer); + } + } + return $this->peers[$key]; + } else { + return parent::valueForKey($key); + } + } + + public function setValueForKey($key, $value) { + if (array_key_exists($key, $this->parentNames)) { + if (is_a($value, 'DatabaseObject')) { + $key = $value->primaryKeyName; + $value = $value->primaryKey; + } + } + if (array_key_exists($key, $this->attributeNames)) { + $this->attributes[$key] = $value; + } else if (array_key_exists($key, $this->childNames) && is_array($value)) { + if (!array_key_exists($key, $this->children)) { + $this->children[$key] = array(); + } + //Add new children + foreach ($value as $child) { + if (is_a($child, $this->childNames[$key]) && is_a($child, 'DatabaseObject')) { + if (!array_key_exists($child->primaryKey, $this->children[$key])) { + $this->children[$key][$child->primaryKey] = $child; + } + } + } + //Remove old children + foreach (array_keys($this->children[$key]) as $childPrimaryKey) { + if (!array_key_exists($childPrimaryKey, $value)) { + unset($this->children[$key][$childPrimaryKey]); + } + } + } else if (array_key_exists($key, $this->peerNames) && is_array($value)) { + if (!array_key_exists($key, $this->peers)) { + $this->peers[$key] = array(); + } + //Add new peers + foreach ($value as $peer) { + if (is_a($peer, $this->peerNames[$key]) && is_a($peer, 'DatabaseObject')) { + if (!array_key_exists($peer->primaryKey, $this->peers[$key])) { + $this->peers[$key][$peer->primaryKey] = $peer; + } + } + } + //Remove old peers + foreach (array_keys($this->peers[$key]) as $peerPrimaryKey) { + if (!array_key_exists($peerPrimaryKey, $value)) { + unset($this->peers[$key][$peerPrimaryKey]); + } + } + } else { + parent::setValueForKey($key, $value); + } + } + + public function delete() { + $query = "DELETE FROM `$this->tableName` WHERE `$this->primaryKeyName` = '$this->primaryKey'"; + return $this->db->processQuery($query); + } + + public function save() { + $pairs = array(); + foreach (array_keys($this->attributeNames) as $attributeName) { + $value = $this->attributes[$attributeName]; + if (!isset($value)) { + $value = "NULL"; + } else { + $value = addslashes($value); + $value = "'$value'"; + } + $pair = "`$attributeName`=$value"; + array_push($pairs, $pair); + } + $set = implode(', ', $pairs); + if (isset($this->primaryKey)) { + // Update object + $query = "UPDATE `$this->tableName` SET $set WHERE `$this->primaryKeyName` = '$this->primaryKey'"; + $this->db->processQuery($query); + } else { + // Insert object + $query = "INSERT INTO `$this->tableName` SET $set"; + $this->primaryKey = $this->db->processQuery($query); + } + } + + + public function all() { + $query = "SELECT * FROM `$this->tableName` ORDER BY 2, 1"; + $result = $this->db->processQuery($query); + $objects = array(); + foreach ($result as $row) { + $className = get_class($this); + $object = new $className(new NamedArguments(array('primaryKey' => $row[0]))); + array_push($objects, $object); + } + + return $objects; + } + + + public function allAsArray() { + $query = "SELECT * FROM `$this->tableName` ORDER BY 2, 1"; + $result = $this->db->processQuery($query, 'assoc'); + + $resultArray = array(); + $rowArray = array(); + + if (isset($result[lcfirst($this->tableName) . 'ID'])){ + foreach (array_keys($result) as $attributeName) { + $rowArray[$attributeName] = $result[$attributeName]; + } + array_push($resultArray, $rowArray); + }else{ + foreach ($result as $row) { + foreach (array_keys($this->attributeNames) as $attributeName) { + $rowArray[$attributeName] = $row[$attributeName]; + } + array_push($resultArray, $rowArray); + } + } + + return $resultArray; + } + + + public function load() { + //if exists in the database + if (isset($this->primaryKey)) { + $query = "SELECT * FROM `$this->tableName` WHERE `$this->primaryKeyName` = '$this->primaryKey'"; + $result = $this->db->processQuery($query, 'assoc'); + + foreach (array_keys($result) as $attributeName) { + $this->addAttribute($attributeName); + $this->attributes[$attributeName] = $result[$attributeName]; + } + }else{ + // Figure out attributes from existing database + $query = "SELECT COLUMN_NAME FROM information_schema.`COLUMNS` WHERE table_schema = '"; + $query .= $this->db->config->database->name . "' AND table_name = '$this->tableName'";// MySQL-specific + foreach ($this->db->processQuery($query) as $result) { + $attributeName = $result[0]; + $this->addAttribute($attributeName); + } + + } + } + +} + ?> \ No newline at end of file diff --git a/admin/classes/common/DynamicObject.php b/admin/classes/common/DynamicObject.php index c71d222..2508b2e 100644 --- a/admin/classes/common/DynamicObject.php +++ b/admin/classes/common/DynamicObject.php @@ -1,46 +1,46 @@ -. -** -************************************************************************************************************************** -*/ - - -class DynamicObject extends Object { - - protected $properties = array(); - - public function valueForKey($key) { - if (property_exists($this, $key)) { - return parent::valueForKey($key); - } else { - if (array_key_exists($key, $this->properties)) { - return $this->properties[$key]; - } else { - return NULL; - } - } - } - - public function setValueForKey($key, $value) { - if (property_exists($this, $key)) { - parent::setValueForKey($key, $value); - } else { - $this->properties[$key] = $value; - } - } - -} - -?> +. +** +************************************************************************************************************************** +*/ + + +class DynamicObject extends Object { + + protected $properties = array(); + + public function valueForKey($key) { + if (property_exists($this, $key)) { + return parent::valueForKey($key); + } else { + if (array_key_exists($key, $this->properties)) { + return $this->properties[$key]; + } else { + return NULL; + } + } + } + + public function setValueForKey($key, $value) { + if (property_exists($this, $key)) { + parent::setValueForKey($key, $value); + } else { + $this->properties[$key] = $value; + } + } + +} + +?> diff --git a/admin/classes/common/Email.php b/admin/classes/common/Email.php index 73bcf6f..78d85ee 100644 --- a/admin/classes/common/Email.php +++ b/admin/classes/common/Email.php @@ -1,92 +1,92 @@ -. -** -************************************************************************************************************************** -*/ - - -class EmailHeader extends DynamicObject { - - protected $fieldName; - protected $fieldBody; - - const LINE_ENDING = "\n"; - - protected function init(NamedArguments $arguments) { - $this->fieldName = $this->fieldNameFromName($arguments->name); - $this->fieldBody = $arguments->body; - - } - - protected function fieldNameFromName($name) { - $headerName = ucfirst($name); - // Hypenate camelCase - $headerName = preg_replace('/([a-z])([A-Z])/', '\1-\2', $headerName); - return $headerName; - } - - public function text() { - return self::$this->fieldName . ': ' . $this->fieldBody . "\n"; - } - -} - - -class Email extends Object { - - protected $to; - protected $subject; - protected $message; - protected $headers = array(); - - protected $from = ""; - protected $replyTo = ""; - - protected function nameIsBasic($name) { - return preg_match('/^(to)|(subject)|(message)$/', $name); - } - - protected function getHeaders() { - $output = ''; - - foreach ($this->headers as $header) { - $output .= $header->text(); - } - //append from and reply to - $output .= "From: " . $this->from . "\r\n"; - $output .= "Reply-To: " . $this->replyTo . "\r\n"; - - return $output; - } - - public function setValueForKey($key, $value) { - if ($this->nameIsBasic($key)) { - parent::setValueForKey($key, $value); - } else { - $this->headers[$key] = new EmailHeader(new NamedArguments(array('name' => $key, 'body' => $value))); - } - } - - public function fullMessage() { - return $this->getHeaders() . "\n" . $this->to . "\n" . $this->subject . "\n" . $this->message; - } - - public function send(){ - return mail($this->to, $this->subject, $newMessage, rtrim($this->getHeaders())); - } - -} - +. +** +************************************************************************************************************************** +*/ + + +class EmailHeader extends DynamicObject { + + protected $fieldName; + protected $fieldBody; + + const LINE_ENDING = "\n"; + + protected function init(NamedArguments $arguments) { + $this->fieldName = $this->fieldNameFromName($arguments->name); + $this->fieldBody = $arguments->body; + + } + + protected function fieldNameFromName($name) { + $headerName = ucfirst($name); + // Hypenate camelCase + $headerName = preg_replace('/([a-z])([A-Z])/', '\1-\2', $headerName); + return $headerName; + } + + public function text() { + return self::$this->fieldName . ': ' . $this->fieldBody . "\n"; + } + +} + + +class Email extends Object { + + protected $to; + protected $subject; + protected $message; + protected $headers = array(); + + protected $from = ""; + protected $replyTo = ""; + + protected function nameIsBasic($name) { + return preg_match('/^(to)|(subject)|(message)$/', $name); + } + + protected function getHeaders() { + $output = ''; + + foreach ($this->headers as $header) { + $output .= $header->text(); + } + //append from and reply to + $output .= "From: " . $this->from . "\r\n"; + $output .= "Reply-To: " . $this->replyTo . "\r\n"; + + return $output; + } + + public function setValueForKey($key, $value) { + if ($this->nameIsBasic($key)) { + parent::setValueForKey($key, $value); + } else { + $this->headers[$key] = new EmailHeader(new NamedArguments(array('name' => $key, 'body' => $value))); + } + } + + public function fullMessage() { + return $this->getHeaders() . "\n" . $this->to . "\n" . $this->subject . "\n" . $this->message; + } + + public function send(){ + return mail($this->to, $this->subject, $newMessage, rtrim($this->getHeaders())); + } + +} + ?> \ No newline at end of file diff --git a/admin/classes/common/LdapPerson.php b/admin/classes/common/LdapPerson.php index 2205f10..7216696 100644 --- a/admin/classes/common/LdapPerson.php +++ b/admin/classes/common/LdapPerson.php @@ -1,64 +1,64 @@ -. -** -************************************************************************************************************************** -*/ - - -class LdapPerson extends DynamicObject { - - public function __construct($userKey) { - - $config = new Configuration; - - //try to connect to ldap if the settings are entered - if ($config->ldap->host) { - - //If you are using OpenLDAP 2.x.x you can specify a URL instead of the hostname. To use LDAP with SSL, compile OpenLDAP 2.x.x with SSL support, configure PHP with SSL, and set this parameter as ldaps://hostname/. - //note that connect happens regardless if host is valid - $ds = ldap_connect($config->ldap->host); - - //may need ldap_bind( $ds, $username, $password ) - $bd = ldap_bind($ds) or die("

Could not connect to " . $config->ldap->host . "

"); - - if ($bd){ - $filter = $config->ldap->search_key . "=" . $userKey; - - $sr = ldap_search($ds, $config->ldap->base_dn, $filter); - - if ($entries = ldap_get_entries($ds, $sr)) { - $entry = $entries[0]; - - $fieldNames = array('fname', 'lname', 'email', 'phone', 'department', 'title', 'address'); - - foreach ($fieldNames as $fieldName) { - $configName = $fieldName . '_field'; - - $this->$fieldName = $entry[$config->ldap->$configName][0]; - - } - $this->fullname = addslashes($this->fname . ' ' . $this->lname); - - } - - ldap_close($ds); - - } - } - } - -} - +. +** +************************************************************************************************************************** +*/ + + +class LdapPerson extends DynamicObject { + + public function __construct($userKey) { + + $config = new Configuration; + + //try to connect to ldap if the settings are entered + if ($config->ldap->host) { + + //If you are using OpenLDAP 2.x.x you can specify a URL instead of the hostname. To use LDAP with SSL, compile OpenLDAP 2.x.x with SSL support, configure PHP with SSL, and set this parameter as ldaps://hostname/. + //note that connect happens regardless if host is valid + $ds = ldap_connect($config->ldap->host); + + //may need ldap_bind( $ds, $username, $password ) + $bd = ldap_bind($ds) or die("

"._("Could not connect to ") . $config->ldap->host . "

"); + + if ($bd){ + $filter = $config->ldap->search_key . "=" . $userKey; + + $sr = ldap_search($ds, $config->ldap->base_dn, $filter); + + if ($entries = ldap_get_entries($ds, $sr)) { + $entry = $entries[0]; + + $fieldNames = array('fname', 'lname', 'email', 'phone', 'department', 'title', 'address'); + + foreach ($fieldNames as $fieldName) { + $configName = $fieldName . '_field'; + + $this->$fieldName = $entry[$config->ldap->$configName][0]; + + } + $this->fullname = addslashes($this->fname . ' ' . $this->lname); + + } + + ldap_close($ds); + + } + } + } + +} + ?> \ No newline at end of file diff --git a/admin/classes/common/NamedArguments.php b/admin/classes/common/NamedArguments.php index ad6e962..8fc99d5 100644 --- a/admin/classes/common/NamedArguments.php +++ b/admin/classes/common/NamedArguments.php @@ -1,54 +1,54 @@ -. -** -************************************************************************************************************************** -*/ - - -class NamedArguments { - - protected $arguments = array(); - - public function __construct($array) { - $this->arguments = $array; - } - - public function __get($name) { - if (array_key_exists($name, $this->arguments)) { - return $this->arguments[$name]; - } - } - - public function __set($name, $value) { - $this->arguments[$name] = $value; - } - - public function setDefaultValueForArgumentName($argumentName, $value) { - if (!array_key_exists($argumentName, $this->arguments)) { - $this->arguments[$argumentName] = $value; - } - } - - public function toJsonString() { - return json_encode($this->arguments); - } - - public function namedArgumentsFromJsonString($string) { - return new NamedAgruments(json_decode($string, true)); - } - -} - +. +** +************************************************************************************************************************** +*/ + + +class NamedArguments { + + protected $arguments = array(); + + public function __construct($array) { + $this->arguments = $array; + } + + public function __get($name) { + if (array_key_exists($name, $this->arguments)) { + return $this->arguments[$name]; + } + } + + public function __set($name, $value) { + $this->arguments[$name] = $value; + } + + public function setDefaultValueForArgumentName($argumentName, $value) { + if (!array_key_exists($argumentName, $this->arguments)) { + $this->arguments[$argumentName] = $value; + } + } + + public function toJsonString() { + return json_encode($this->arguments); + } + + public function namedArgumentsFromJsonString($string) { + return new NamedAgruments(json_decode($string, true)); + } + +} + ?> \ No newline at end of file diff --git a/admin/classes/common/Object.php b/admin/classes/common/Object.php index 653e9ce..ddcaa56 100644 --- a/admin/classes/common/Object.php +++ b/admin/classes/common/Object.php @@ -1,89 +1,89 @@ -. -** -************************************************************************************************************************** -*/ - - -class Object { - - public function __construct(NamedArguments $arguments = NULL) { - if (method_exists($this, 'init')) { - if (!is_a($arguments, 'NamedArguments')) { - $arguments = new NamedArguments(array()); - } - $this->init($arguments); - } - } - - // An optional initializer to use instead of |__construct()|. - protected function init(NamedArguments $arguments) { - - } - - public function __destruct() { - if (method_exists($this, 'dealloc')) { - $this->dealloc(); - } - } - - // An optional method called on deconstruction instead of |__deconstruct()|. - protected function dealloc() { - - } - - // Setters are functions called |$instance->setPropertyName($value)|. - public function __set($name, $value) { - $methodName = 'set' . ucfirst($name); - $this->$methodName($value); - } - - // Getters are functions called |$instance->propertyName()|. - public function __get($name) { - return $this->$name(); - } - - // Default setter uses declared properties. - protected function setValueForKey($key, $value) { - if (property_exists($this, $key)) { - $this->$key = $value; - } else { - throw new Exception("Cannot set value for undefined key ($key)."); - } - } - - // Default getter uses declared properties. - protected function valueForKey($key) { - if (property_exists($this, $key)) { - return $this->$key; - } else { - throw new Exception("Cannot get value for undefined key ($key)."); - } - } - - // Call |valueForKey| and |setValueForKey| as default setter and getter. - public function __call($name, $arguments) { - if (preg_match('/^set[A-Z]/', $name)) { - $key = preg_replace('/^set/', '\1', $name); - $key = lcfirst($key); - $this->setValueForKey($key, $arguments[0]); - } else { - return $this->valueForKey($name); - } - } - -} - +. +** +************************************************************************************************************************** +*/ + + +class Object { + + public function __construct(NamedArguments $arguments = NULL) { + if (method_exists($this, 'init')) { + if (!is_a($arguments, 'NamedArguments')) { + $arguments = new NamedArguments(array()); + } + $this->init($arguments); + } + } + + // An optional initializer to use instead of |__construct()|. + protected function init(NamedArguments $arguments) { + + } + + public function __destruct() { + if (method_exists($this, 'dealloc')) { + $this->dealloc(); + } + } + + // An optional method called on deconstruction instead of |__deconstruct()|. + protected function dealloc() { + + } + + // Setters are functions called |$instance->setPropertyName($value)|. + public function __set($name, $value) { + $methodName = 'set' . ucfirst($name); + $this->$methodName($value); + } + + // Getters are functions called |$instance->propertyName()|. + public function __get($name) { + return $this->$name(); + } + + // Default setter uses declared properties. + protected function setValueForKey($key, $value) { + if (property_exists($this, $key)) { + $this->$key = $value; + } else { + throw new Exception(_("Cannot set value for undefined key (")."$key)."); + } + } + + // Default getter uses declared properties. + protected function valueForKey($key) { + if (property_exists($this, $key)) { + return $this->$key; + } else { + throw new Exception(_("Cannot get value for undefined key (")."$key)."); + } + } + + // Call |valueForKey| and |setValueForKey| as default setter and getter. + public function __call($name, $arguments) { + if (preg_match('/^set[A-Z]/', $name)) { + $key = preg_replace('/^set/', '\1', $name); + $key = lcfirst($key); + $this->setValueForKey($key, $arguments[0]); + } else { + return $this->valueForKey($name); + } + } + +} + ?> \ No newline at end of file diff --git a/admin/classes/common/Utility.php b/admin/classes/common/Utility.php index 6cbc8dc..b6af77a 100644 --- a/admin/classes/common/Utility.php +++ b/admin/classes/common/Utility.php @@ -1,158 +1,158 @@ -. -** -************************************************************************************************************************** -*/ - - -class Utility { - - public function unixTimeFromMysqlTimestamp($timestamp) { - - // taken from Dan Green, and then modified to be correct - // http://www.weberdev.com/get_example-1427.html - - $year = substr($timestamp,0,4); - $month = substr($timestamp,5,2); - $day = substr($timestamp,8,2); - $hour = substr($timestamp,11,2); - $minute = substr($timestamp,14,2); - $second = substr($timestamp,17,2); - $newdate = mktime($hour,$minute,$second,$month,$day,$year); - - return $newdate; - - } - - public function secondsFromDays($days) { - return $days * 24 * 60 * 60; - } - - public function objectFromArray($array) { - $object = new DynamicObject; - foreach ($array as $key => $value) { - if (is_array($value)) { - $object->$key = Utility::objectFromArray($value); - } else { - $object->$key = $value; - } - } - return $object; - } - - //returns file path up to /coral/ - public function getCORALPath(){ - $pagePath = $_SERVER["DOCUMENT_ROOT"]; - - $currentFile = $_SERVER["SCRIPT_NAME"]; - $parts = Explode('/', $currentFile); - for($i=0; $igetCORALURL() . "auth/"; - } - - - - - public function hashString($hashAlgorithm, $string){ - - $hashedString = hash($hashAlgorithm, $string); - - return $hashedString; - - } - - public function randomString($stringLength){ - - $string = ''; - $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - $charsLength = strlen($chars)-1; - - for ($i = 0; $i != $stringLength; $i++){ - $randInd = rand(0,$charsLength); - $string .= substr($chars, $randInd, 1); - } - - return $string; - } - - - public function setSessionCookie($sessionID, $time){ - - setcookie("CORALSessionID", $sessionID, $time, "/" ); - - } - - - public function setLoginCookie($loginID, $time){ - - setcookie("CORALLoginID", $loginID, $time, "/" ); - - } - - - public function setRememberLogin($loginID, $time){ - - setcookie("CORALRemember", $loginID, $time); - - } - - public function getSessionCookie(){ - - if(array_key_exists('CORALSessionID', $_COOKIE)){ - return $_COOKIE['CORALSessionID']; - } - - } - - public function getRememberLogin(){ - - if(array_key_exists('CORALRemember', $_COOKIE)){ - return $_COOKIE['CORALRemember']; - } - - } - - -} - +. +** +************************************************************************************************************************** +*/ + + +class Utility { + + public function unixTimeFromMysqlTimestamp($timestamp) { + + // taken from Dan Green, and then modified to be correct + // http://www.weberdev.com/get_example-1427.html + + $year = substr($timestamp,0,4); + $month = substr($timestamp,5,2); + $day = substr($timestamp,8,2); + $hour = substr($timestamp,11,2); + $minute = substr($timestamp,14,2); + $second = substr($timestamp,17,2); + $newdate = mktime($hour,$minute,$second,$month,$day,$year); + + return $newdate; + + } + + public function secondsFromDays($days) { + return $days * 24 * 60 * 60; + } + + public function objectFromArray($array) { + $object = new DynamicObject; + foreach ($array as $key => $value) { + if (is_array($value)) { + $object->$key = Utility::objectFromArray($value); + } else { + $object->$key = $value; + } + } + return $object; + } + + //returns file path up to /coral/ + public function getCORALPath(){ + $pagePath = $_SERVER["DOCUMENT_ROOT"]; + + $currentFile = $_SERVER["SCRIPT_NAME"]; + $parts = Explode('/', $currentFile); + for($i=0; $igetCORALURL() . "auth/"; + } + + + + + public function hashString($hashAlgorithm, $string){ + + $hashedString = hash($hashAlgorithm, $string); + + return $hashedString; + + } + + public function randomString($stringLength){ + + $string = ''; + $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + $charsLength = strlen($chars)-1; + + for ($i = 0; $i != $stringLength; $i++){ + $randInd = rand(0,$charsLength); + $string .= substr($chars, $randInd, 1); + } + + return $string; + } + + + public function setSessionCookie($sessionID, $time){ + + setcookie("CORALSessionID", $sessionID, $time, "/" ); + + } + + + public function setLoginCookie($loginID, $time){ + + setcookie("CORALLoginID", $loginID, $time, "/" ); + + } + + + public function setRememberLogin($loginID, $time){ + + setcookie("CORALRemember", $loginID, $time); + + } + + public function getSessionCookie(){ + + if(array_key_exists('CORALSessionID', $_COOKIE)){ + return $_COOKIE['CORALSessionID']; + } + + } + + public function getRememberLogin(){ + + if(array_key_exists('CORALRemember', $_COOKIE)){ + return $_COOKIE['CORALRemember']; + } + + } + + +} + ?> \ No newline at end of file diff --git a/admin/classes/domain/Session.php b/admin/classes/domain/Session.php index 1c69234..6059990 100644 --- a/admin/classes/domain/Session.php +++ b/admin/classes/domain/Session.php @@ -1,32 +1,32 @@ -. -** -************************************************************************************************************************** -*/ - - -class Session extends DatabaseObject { - - protected function defineRelationships() {} - - protected function overridePrimaryKeyName() {} - - - - - -} - +. +** +************************************************************************************************************************** +*/ + + +class Session extends DatabaseObject { + + protected function defineRelationships() {} + + protected function overridePrimaryKeyName() {} + + + + + +} + ?> \ No newline at end of file diff --git a/admin/classes/domain/User.php b/admin/classes/domain/User.php index df72a08..0b29984 100644 --- a/admin/classes/domain/User.php +++ b/admin/classes/domain/User.php @@ -1,223 +1,223 @@ -. -** -************************************************************************************************************************** -*/ - - -class User extends DatabaseObject { - - protected function defineRelationships() {} - - protected function overridePrimaryKeyName() { - $this->primaryKeyName = 'loginID'; - } - - - //used only for allowing access to admin page - public function isAdmin(){ - if ($this->adminInd == 'Y' || $this->adminInd == '1'){ - return true; - }else{ - return false; - } - - } - - - public function allAsArray() { - $query = "SELECT * FROM User ORDER BY 1"; - $result = $this->db->processQuery($query, 'assoc'); - - $resultArray = array(); - $rowArray = array(); - - if ($result['loginID']){ - foreach (array_keys($result) as $attributeName) { - $rowArray[$attributeName] = $result[$attributeName]; - } - array_push($resultArray, $rowArray); - }else{ - foreach ($result as $row) { - foreach (array_keys($this->attributeNames) as $attributeName) { - $rowArray[$attributeName] = $row[$attributeName]; - } - array_push($resultArray, $rowArray); - } - } - - return $resultArray; - } - - - public function processLogin($password){ - - $util = new Utility(); - $config = new Configuration(); - - if($config->ldap->ldap_enabled=="Y"){ - $host = $config->ldap->host; - $ldaprdn = $config->ldap->base_dn; // ldap rdn or dn - $ldappass = $password; // associated password - $filter = "(".$config->ldap->search_key."=".$this->loginID.")"; //search filter - $ldapport = $config->ldap->port; //ldap server port - $bindAccount = $config->ldap->bindAccount; //bind account - $bindPass = $config->ldap->bindPass; //bind password - - // connect to ldap server - if($ldapport != ''){ - $ldapconn = ldap_connect($host, $ldapport) - or die("Could not connect to LDAP server."); - - ldap_set_option ($ldapconn, LDAP_OPT_REFERRALS, 0); - ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3); - - }else{ - $ldapconn = ldap_connect($host) - or die("Could not connect to LDAP server."); - } - - - if ($ldapconn) { - if($bindAccount != ""){ - if($bindPass == ''){ - error_log("A bind password must be provided with a bind account"); - die("There is a problem with the LDAP configuration, contact your server administrator."); - } - //bind to ldap server - $ldapbind = ldap_bind($ldapconn, $bindAccount, $bindPass); - - }else{ - // binding to ldap server - //$ldapbind = ldap_bind($ldapconn, $ldaprdn, $ldappass); - $ldapbind = ldap_bind($ldapconn); - // verify binding - } - - if ($ldapbind) { - //echo "LDAP bind successful..."; - $ldapSearch = ldap_search($ldapconn, $ldaprdn, $filter); - - if($ldapSearch){ - $ldap_result = ldap_get_entries($ldapconn, $ldapSearch); - - $success = ldap_bind($ldapconn, $ldap_result[0]['dn'], $ldappass); - - if(!$success){ return false;} - } - else{ - return false; - } - }else{ - return false; - } - } - }else{ // built-in auth - //verify the password is correct - //get the hashed password - $pwh = $util->hashString('sha512', $this->passwordPrefix . $password); - - //password failed!! - if ($this->password != $pwh){ - return false; - } - } - //passed password test - - //create new session - $sessionID = $util->randomString(100); - - $session = new Session(); - $session->sessionID = $sessionID; - $session->loginID = $this->loginID; - $session->timestamp = date( 'Y-m-d H:i:s' ); - - $session->save(); - - //also set the cookie - $util->setSessionCookie($sessionID, time() + $config->settings->timeout); - $util->setLoginCookie($this->loginID, time() + $config->settings->timeout); - - //also set session variable - $_SESSION['loginID'] = $this->loginID; - - return true; - } - - - public function processLogout(){ - - $util = new Utility(); - $config = new Configuration(); - - //delete the session record in database - $sessionID = $util->getSessionCookie(); - - if ($sessionID){ - $session = new Session(new NamedArguments(array('primaryKey' => $sessionID))); - $session->delete(); - } - - //expire the cookie - $util->setSessionCookie($sessionID, time() - $config->settings->timeout); - - //unset the login session variable - unset($_SESSION['loginID']); - - - - } - - - - public function getOpenSession(){ - - $util = new Utility(); - - return $util->getSessionCookie(); - - } - - - public function getRememberLogin(){ - - $util = new Utility(); - - return $util->getRememberLogin(); - - } - - - public function setRememberLogin(){ - - $util = new Utility(); - - //expire in 180 days - return $util->setRememberLogin($this->loginID, time()+60*60*24*180); - - } - - - public function unsetRememberLogin(){ - - $util = new Utility(); - - return $util->setRememberLogin($this->loginID, time()-60); - - } - -} - -?> +. +** +************************************************************************************************************************** +*/ + + +class User extends DatabaseObject { + + protected function defineRelationships() {} + + protected function overridePrimaryKeyName() { + $this->primaryKeyName = 'loginID'; + } + + + //used only for allowing access to admin page + public function isAdmin(){ + if ($this->adminInd == 'Y' || $this->adminInd == '1'){ + return true; + }else{ + return false; + } + + } + + + public function allAsArray() { + $query = "SELECT * FROM User ORDER BY 1"; + $result = $this->db->processQuery($query, 'assoc'); + + $resultArray = array(); + $rowArray = array(); + + if ($result['loginID']){ + foreach (array_keys($result) as $attributeName) { + $rowArray[$attributeName] = $result[$attributeName]; + } + array_push($resultArray, $rowArray); + }else{ + foreach ($result as $row) { + foreach (array_keys($this->attributeNames) as $attributeName) { + $rowArray[$attributeName] = $row[$attributeName]; + } + array_push($resultArray, $rowArray); + } + } + + return $resultArray; + } + + + public function processLogin($password){ + + $util = new Utility(); + $config = new Configuration(); + + if($config->ldap->ldap_enabled=="Y"){ + $host = $config->ldap->host; + $ldaprdn = $config->ldap->base_dn; // ldap rdn or dn + $ldappass = $password; // associated password + $filter = "(".$config->ldap->search_key."=".$this->loginID.")"; //search filter + $ldapport = $config->ldap->port; //ldap server port + $bindAccount = $config->ldap->bindAccount; //bind account + $bindPass = $config->ldap->bindPass; //bind password + + // connect to ldap server + if($ldapport != ''){ + $ldapconn = ldap_connect($host, $ldapport) + or die(_("Could not connect to LDAP server.")); + + ldap_set_option ($ldapconn, LDAP_OPT_REFERRALS, 0); + ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3); + + }else{ + $ldapconn = ldap_connect($host) + or die(_("Could not connect to LDAP server.")); + } + + + if ($ldapconn) { + if($bindAccount != ""){ + if($bindPass == ''){ + error_log("A bind password must be provided with a bind account"); + die(_("There is a problem with the LDAP configuration, contact your server administrator.")); + } + //bind to ldap server + $ldapbind = ldap_bind($ldapconn, $bindAccount, $bindPass); + + }else{ + // binding to ldap server + //$ldapbind = ldap_bind($ldapconn, $ldaprdn, $ldappass); + $ldapbind = ldap_bind($ldapconn); + // verify binding + } + + if ($ldapbind) { + //echo "LDAP bind successful..."; + $ldapSearch = ldap_search($ldapconn, $ldaprdn, $filter); + + if($ldapSearch){ + $ldap_result = ldap_get_entries($ldapconn, $ldapSearch); + + $success = ldap_bind($ldapconn, $ldap_result[0]['dn'], $ldappass); + + if(!$success){ return false;} + } + else{ + return false; + } + }else{ + return false; + } + } + }else{ // built-in auth + //verify the password is correct + //get the hashed password + $pwh = $util->hashString('sha512', $this->passwordPrefix . $password); + + //password failed!! + if ($this->password != $pwh){ + return false; + } + } + //passed password test + + //create new session + $sessionID = $util->randomString(100); + + $session = new Session(); + $session->sessionID = $sessionID; + $session->loginID = $this->loginID; + $session->timestamp = date( 'Y-m-d H:i:s' ); + + $session->save(); + + //also set the cookie + $util->setSessionCookie($sessionID, time() + $config->settings->timeout); + $util->setLoginCookie($this->loginID, time() + $config->settings->timeout); + + //also set session variable + $_SESSION['loginID'] = $this->loginID; + + return true; + } + + + public function processLogout(){ + + $util = new Utility(); + $config = new Configuration(); + + //delete the session record in database + $sessionID = $util->getSessionCookie(); + + if ($sessionID){ + $session = new Session(new NamedArguments(array('primaryKey' => $sessionID))); + $session->delete(); + } + + //expire the cookie + $util->setSessionCookie($sessionID, time() - $config->settings->timeout); + + //unset the login session variable + unset($_SESSION['loginID']); + + + + } + + + + public function getOpenSession(){ + + $util = new Utility(); + + return $util->getSessionCookie(); + + } + + + public function getRememberLogin(){ + + $util = new Utility(); + + return $util->getRememberLogin(); + + } + + + public function setRememberLogin(){ + + $util = new Utility(); + + //expire in 180 days + return $util->setRememberLogin($this->loginID, time()+60*60*24*180); + + } + + + public function unsetRememberLogin(){ + + $util = new Utility(); + + return $util->setRememberLogin($this->loginID, time()-60); + + } + +} + +?> diff --git a/admin/configuration_sample.ini b/admin/configuration_sample.ini index 51bfa4f..86c2846 100644 --- a/admin/configuration_sample.ini +++ b/admin/configuration_sample.ini @@ -1,20 +1,20 @@ -[settings] -timeout=3600 - -[ldap] -ldap_enabled = "N" -host = "ldap.example.edu" -port = "" -search_key = "" -base_dn = "" -fname_field = "" -lname_field = "" -bindAccount = "" -bindPass = "" - -[database] -type = "mysql" -host = "" -name = "" -username = "coral" -password = "" +[settings] +timeout=3600 + +[ldap] +ldap_enabled = "N" +host = "ldap.example.edu" +port = "" +search_key = "" +base_dn = "" +fname_field = "" +lname_field = "" +bindAccount = "" +bindPass = "" + +[database] +type = "mysql" +host = "" +name = "" +username = "coral" +password = "" diff --git a/ajax_forms.php b/ajax_forms.php index 0cb8361..e017082 100644 --- a/ajax_forms.php +++ b/ajax_forms.php @@ -40,7 +40,7 @@
-
+
@@ -53,16 +53,16 @@
- +   -
Enter password for changes only
"; } ?> - +
"; } ?> +  
- +  
- +   />
@@ -74,8 +74,8 @@
Login ID Admin?
- - + +
@@ -84,32 +84,26 @@ "; echo "" . $userArray['loginID'] . ""; echo "" . $isAdmin . ""; - echo "edit password or admin status"; - echo "remove"; + echo ""._("edit password or admin status").""; + echo ""._("remove").""; echo ""; } ?> - add new user + add new user"; + echo "(none found)
"._("add new user").""; } break; @@ -72,7 +72,7 @@ default: - echo "Action " . $action . " not set up!"; + echo _("Action ") . $action . _(" not set up!"); break; diff --git a/ajax_processing.php b/ajax_processing.php index 8e16020..44cdf43 100644 --- a/ajax_processing.php +++ b/ajax_processing.php @@ -74,7 +74,7 @@ try { $dUser->delete(); - echo "User successfully deleted."; + echo _("User successfully deleted."); } catch (Exception $e) { echo $e->getMessage(); } @@ -86,7 +86,7 @@ default: - echo "Action " . $action . " not set up!"; + echo _("Action ") . $action . _(" not set up!"); break; } diff --git a/css/style.css b/css/style.css index 8488d86..42c6d33 100644 --- a/css/style.css +++ b/css/style.css @@ -1,7 +1,7 @@ html { height: 100%; margin: 0; - padding: 0 + padding: 0; } body { diff --git a/css/thickbox.css b/css/thickbox.css index f47142b..81e5a14 100644 --- a/css/thickbox.css +++ b/css/thickbox.css @@ -1,167 +1,167 @@ -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -*{padding: 0; margin: 0;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_window { - font: 12px Arial, Helvetica, sans-serif; - color: #2c3c42; -} - -#TB_secondLine { - font: 11px Arial, Helvetica, sans-serif; - color:#2c3c42; -} - -#TB_window a:link {color: #3D545D;} -#TB_window a:visited {color: #3D545D;} -#TB_window a:hover {color: #000;} -#TB_window a:active {color: #3D545D;} -#TB_window a:focus{color: #3D545D;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_overlay { - position: fixed; - z-index:100; - top: 0px; - left: 0px; - height:100%; - width:100%; -} - -.smallText{color:#3D545D;font-size:92%;} - -.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} -.TB_overlayBG { - background-color:#000; - filter:alpha(opacity=75); - -moz-opacity: 0.75; - opacity: 0.75; -} - -* html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_window { - position: fixed; - background: #ffffff; - z-index: 102; - color:#3D545D; - display:none; - border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; -} - -* html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_window img#TB_Image { - display:block; - margin: 15px 0 0 15px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-top: 1px solid #666; - border-left: 1px solid #666; -} - -#TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; -} - -#TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; -} - -#TB_closeAjaxWindow{ - padding:7px 10px 5px 0; - margin-bottom:1px; - text-align:right; - float:right; -} - -#TB_ajaxWindowTitle{ - float:left; - padding:7px 0 5px 10px; - margin-bottom:1px; -} - -#TB_title{ - background-color:#e8e8e8; - height:27px; -} - -#TB_ajaxContent{ - clear:both; - margin:3px 5px 5px 5px; - overflow:auto; - text-align:left; - line-height:1.4em; -} - -#TB_ajaxContent.TB_modal{ - padding: 15px; - width: auto !important; - height: auto !important; -} - -#TB_ajaxContent p{ - padding:5px 0px 5px 0px; -} - -#TB_load{ - position: fixed; - display:none; - height:13px; - width:208px; - z-index:103; - top: 50%; - left: 50%; - margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ -} - -* html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_HideSelect{ - z-index:99; - position:fixed; - top: 0; - left: 0; - background-color:#fff; - border:none; - filter:alpha(opacity=0); - -moz-opacity: 0; - opacity: 0; - height:100%; - width:100%; -} - -* html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_iframeContent{ - clear:both; - border:none; - margin-bottom:-1px; - margin-top:1px; - _margin-bottom:1px; -} +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +*{padding: 0; margin: 0;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_window { + font: 12px Arial, Helvetica, sans-serif; + color: #2c3c42; +} + +#TB_secondLine { + font: 11px Arial, Helvetica, sans-serif; + color:#2c3c42; +} + +#TB_window a:link {color: #3D545D;} +#TB_window a:visited {color: #3D545D;} +#TB_window a:hover {color: #000;} +#TB_window a:active {color: #3D545D;} +#TB_window a:focus{color: #3D545D;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_overlay { + position: fixed; + z-index:100; + top: 0px; + left: 0px; + height:100%; + width:100%; +} + +.smallText{color:#3D545D;font-size:92%;} + +.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} +.TB_overlayBG { + background-color:#000; + filter:alpha(opacity=75); + -moz-opacity: 0.75; + opacity: 0.75; +} + +* html #TB_overlay { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_window { + position: fixed; + background: #ffffff; + z-index: 102; + color:#3D545D; + display:none; + border: 4px solid #525252; + text-align:left; + top:50%; + left:50%; +} + +* html #TB_window { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_window img#TB_Image { + display:block; + margin: 15px 0 0 15px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-top: 1px solid #666; + border-left: 1px solid #666; +} + +#TB_caption{ + height:25px; + padding:7px 30px 10px 25px; + float:left; +} + +#TB_closeWindow{ + height:25px; + padding:11px 25px 10px 0; + float:right; +} + +#TB_closeAjaxWindow{ + padding:7px 10px 5px 0; + margin-bottom:1px; + text-align:right; + float:right; +} + +#TB_ajaxWindowTitle{ + float:left; + padding:7px 0 5px 10px; + margin-bottom:1px; +} + +#TB_title{ + background-color:#e8e8e8; + height:27px; +} + +#TB_ajaxContent{ + clear:both; + margin:3px 5px 5px 5px; + overflow:auto; + text-align:left; + line-height:1.4em; +} + +#TB_ajaxContent.TB_modal{ + padding: 15px; + width: auto !important; + height: auto !important; +} + +#TB_ajaxContent p{ + padding:5px 0px 5px 0px; +} + +#TB_load{ + position: fixed; + display:none; + height:13px; + width:208px; + z-index:103; + top: 50%; + left: 50%; + margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ +} + +* html #TB_load { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_HideSelect{ + z-index:99; + position:fixed; + top: 0; + left: 0; + background-color:#fff; + border:none; + filter:alpha(opacity=0); + -moz-opacity: 0; + opacity: 0; + height:100%; + width:100%; +} + +* html #TB_HideSelect { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_iframeContent{ + clear:both; + border:none; + margin-bottom:-1px; + margin-top:1px; + _margin-bottom:1px; +} diff --git a/directory.php b/directory.php index c7ad949..9b21798 100644 --- a/directory.php +++ b/directory.php @@ -59,5 +59,20 @@ function lcfirst($string) { @date_default_timezone_set(@date_default_timezone_get()); } +// Include file of language codes +include_once 'LangCodes.php'; +$lang_name = new LangCodes(); +// Verify the language of the browser + global $http_lang; + if(isset($_COOKIE["lang"])){ + $http_lang = $_COOKIE["lang"]; + }else{ + $codeL = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2); + $http_lang = $lang_name->getLanguage($codeL); + } + putenv("LC_ALL=$http_lang"); + setlocale(LC_ALL, $http_lang.".utf8"); + bindtextdomain("messages", "./locale"); + textdomain("messages"); ?> \ No newline at end of file diff --git a/index.php b/index.php index b7a449c..21dbb30 100644 --- a/index.php +++ b/index.php @@ -21,9 +21,10 @@ session_start(); include_once 'directory.php'; - $util = new Utility(); + + if (isset($_GET['service'])){ $service = $_GET['service']; }else{ @@ -51,7 +52,7 @@ $user->processLogout(); - $message = 'You are successfully logged out of the system.'; + $message = _('You are successfully logged out of the system.'); $user = new User(); @@ -63,7 +64,7 @@ } //the user is trying to log in -}else if ($_POST['loginID'] && $_POST['password']){ +}else if (isset($_POST['loginID']) && isset($_POST['password'])){ $loginID = $_POST['loginID']; $password = $_POST['password']; @@ -82,12 +83,12 @@ //perform login checks if ($user->loginID == ''){ - $errorMessage = "Invalid login ID. Please try again."; + $errorMessage = _("Invalid login ID. Please try again."); //perform login, if failed issue message }else{ if(!$user->processLogin($password)){ - $errorMessage = "Invalid password. Please try again."; + $errorMessage = _("Invalid password. Please try again."); $inputLoginID = $loginID; }else{ @@ -103,7 +104,7 @@ }else if(isset($_SESSION['loginID'])){ if ($user->getOpenSession()){ - $message = "You are already logged in as " . $loginID . ".
You may log in as another user below, return or logout."; + $message = _("You are already logged in as ") . $loginID . ".
" . _("You may log in as another user below,")." "._("return")." "._("or")." ". _("logout")."."; } $inputLoginID = $user->getRememberLogin(); @@ -124,7 +125,7 @@ $rememberChecked = 'checked'; } - $message = "Please enter login credentials to sign in."; + $message = _("Please enter login credentials to sign in."); } @@ -132,7 +133,7 @@ //user was just timed out if(array_key_exists('timeout', $_GET)){ - $errorMessage = "Your session has timed out."; + $errorMessage = _("Your session has timed out."); $message = ""; } @@ -141,7 +142,7 @@ //user does not have permissions to enter the module if(array_key_exists('invalid', $_GET)){ - $errorMessage = "You do not have permission to enter.
Please contact an administrator."; + $errorMessage = _("You do not have permission to enter.")."
"._("Please contact an administrator."); $message = ""; } @@ -151,7 +152,7 @@ //user needs to access admin page if(array_key_exists('admin', $_GET)){ - $errorMessage = "You must log in before accessing the admin page."; + $errorMessage = _("You must log in before accessing the admin page."); $message = ""; } @@ -172,9 +173,24 @@ + +getLanguage($str); + if($default_l==null || empty($default_l)){$default_l=$str;} + if(isset($_COOKIE["lang"])){ + if($_COOKIE["lang"]==$http_lang && $_COOKIE["lang"] != "en_US"){ + echo ""; + } + }else if($default_l==$http_lang && $default_l != "en_US"){ + echo ""; + } +?> - +
@@ -184,22 +200,63 @@

- +
- +
- /> Remember my login ID + /> 
- +
- -
Admin page
+
+

+ +
+
@@ -211,7 +268,23 @@


- + +
@@ -207,7 +229,7 @@
- +

Welcome to a new CORAL Auth installation!

This installation will: @@ -281,8 +303,10 @@ //second step - ask for DB info to run DDL } else if ($step == '2') { - if (!$database_host) $database_host='localhost'; - if (!$database_name) $database_name='coral_auth_prod'; + if (!isset($database_host)) $database_host='localhost'; + if (!isset($database_name)) $database_name='coral_auth_prod'; + if (!isset($database_username)) $database_username = ""; + if (!isset($database_password)) $database_password = ""; ?>

MySQL info with permissions to create tables

@@ -299,7 +323,7 @@  Database Host - + @@ -339,7 +363,26 @@ //third step - ask for DB info to log in from CORAL } else if ($step == '3') { - if (!$session_timeout) $session_timeout='3600'; + if (!isset($session_timeout)) $session_timeout='3600'; + + $ldap = array('host'=>'', 'port'=>'', 'search_key'=>'', 'base_dn'=>'', 'bindAccount'=>'','bindPass'=>''); + if (isset($_POST['ldap_enabled'])) { + $ldap['ldap_enabled'] = 'Y'; + if (isset($_POST['ldap_host'])) + $ldap['host'] = $_POST['ldap_host']; + if (isset($_POST['ldap_port'])) + $ldap['port'] = $_POST['ldap_port']; + if (isset($_POST['ldap_search_key'])) + $ldap['search_key'] = $_POST['ldap_search_key']; + if (isset($_POST['ldap_base_dn'])) + $ldap['base_dn'] = $_POST['ldap_base_dn']; + if (isset($_POST['ldap_bind_account'])) + $ldap['bindAccount'] = $_POST['ldap_bind_account']; + if (isset($_POST['ldap_bind_password'])) + $ldap['bindPass'] = $_POST['ldap_bind_password']; + } else { + $ldap['ldap_enabled'] = 'N'; + } ?> @@ -377,9 +420,63 @@ - + + +   + + + +  Enable LDAP + + onclick="ShowLDAP()"> + + + +  LDAP Host + + > + + + + +  LDAP Port + + > + + + + +  LDAP Search Key + + > + + + + +  LDAP Base DN + + > + + + + +  LDAP Bind Account + + > + + + + +  LDAP Bind Password + + > + + + +   +   @@ -389,9 +486,11 @@ -
+ a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1; + +return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/\s*$/g,ra={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?""!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("
"); - $("#TB_overlay").click(tb_remove); - } - }else{//all others - if(document.getElementById("TB_overlay") === null){ - $("body").append("
"); - $("#TB_overlay").click(tb_remove); - } - } - - if(tb_detectMacXFF()){ - $("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash - }else{ - $("#TB_overlay").addClass("TB_overlayBG");//use background and opacity - } - - if(caption===null){caption="";} - $("body").append("
");//add loader to the page - $('#TB_load').show();//show loader - - var baseURL; - if(url.indexOf("?")!==-1){ //ff there is a query string involved - baseURL = url.substr(0, url.indexOf("?")); - }else{ - baseURL = url; - } - - var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/; - var urlType = baseURL.toLowerCase().match(urlString); - - if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images - - TB_PrevCaption = ""; - TB_PrevURL = ""; - TB_PrevHTML = ""; - TB_NextCaption = ""; - TB_NextURL = ""; - TB_NextHTML = ""; - TB_imageCount = ""; - TB_FoundURL = false; - if(imageGroup){ - TB_TempArray = $("a[@rel="+imageGroup+"]").get(); - for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) { - var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); - if (!(TB_TempArray[TB_Counter].href == url)) { - if (TB_FoundURL) { - TB_NextCaption = TB_TempArray[TB_Counter].title; - TB_NextURL = TB_TempArray[TB_Counter].href; - TB_NextHTML = "  Next >"; - } else { - TB_PrevCaption = TB_TempArray[TB_Counter].title; - TB_PrevURL = TB_TempArray[TB_Counter].href; - TB_PrevHTML = "  < Prev"; - } - } else { - TB_FoundURL = true; - TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length); - } - } - } - - imgPreloader = new Image(); - imgPreloader.onload = function(){ - imgPreloader.onload = null; - - // Resizing large images - orginal by Christian Montoya edited by me. - var pagesize = tb_getPageSize(); - var x = pagesize[0] - 150; - var y = pagesize[1] - 150; - - var imageWidth = imgPreloader.width; - var imageHeight = imgPreloader.height; - if (imageWidth > x) { - imageHeight = imageHeight * (x / imageWidth); - imageWidth = x; - if (imageHeight > y) { - imageWidth = imageWidth * (y / imageHeight); - imageHeight = y; - } - } else if (imageHeight > y) { - imageWidth = imageWidth * (y / imageHeight); - imageHeight = y; - if (imageWidth > x) { - imageHeight = imageHeight * (x / imageWidth); - imageWidth = x; - } - } - // End Resizing - - TB_WIDTH = imageWidth + 30; - TB_HEIGHT = imageHeight + 60; - $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); - - $("#TB_closeWindowButton").click(tb_remove); - $("#TB_cancelWindowButton").click(tb_remove); - - if (!(TB_PrevHTML === "")) { - function goPrev(){ - if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);} - $("#TB_window").remove(); - $("body").append("
"); - tb_show(TB_PrevCaption, TB_PrevURL, imageGroup); - return false; - } - $("#TB_prev").click(goPrev); - } - - if (!(TB_NextHTML === "")) { - function goNext(){ - $("#TB_window").remove(); - $("body").append("
"); - tb_show(TB_NextCaption, TB_NextURL, imageGroup); - return false; - } - $("#TB_next").click(goNext); - - } - - document.onkeydown = function(e){ - if (e == null) { // ie - keycode = event.keyCode; - } else { // mozilla - keycode = e.which; - } - if(keycode == 27){ // close - tb_remove(); - } else if(keycode == 190){ // display previous image - if(!(TB_NextHTML == "")){ - document.onkeydown = ""; - goNext(); - } - } else if(keycode == 188){ // display next image - if(!(TB_PrevHTML == "")){ - document.onkeydown = ""; - goPrev(); - } - } - }; - - tb_position(); - $("#TB_load").remove(); - $("#TB_ImageOff").click(tb_remove); - $("#TB_window").css({display:"block"}); //for safari using css instead of show - }; - - imgPreloader.src = url; - }else{//code to show html - - var queryString = url.replace(/^[^\?]+\??/,''); - var params = tb_parseQuery( queryString ); - - TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL - TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL - - ajaxContentW = TB_WIDTH - 30; - ajaxContentH = TB_HEIGHT - 45; - - if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window - urlNoQuery = url.split('TB_'); - $("#TB_iframeContent").remove(); - if(params['modal'] != "true"){//iframe no modal - $("#TB_window").append("
"+caption+"
close or Esc Key
"); - }else{//iframe modal - $("#TB_overlay").unbind(); - $("#TB_window").append(""); - } - }else{// not an iframe, ajax - if($("#TB_window").css("display") != "block"){ - if(params['modal'] != "true"){//ajax no modal - $("#TB_window").append("
"+caption+"
close or Esc Key
"); - }else{//ajax modal - $("#TB_overlay").unbind(); - $("#TB_window").append("
"); - } - }else{//this means the window is already up, we are just loading new content via ajax - $("#TB_ajaxContent")[0].style.width = ajaxContentW +"px"; - $("#TB_ajaxContent")[0].style.height = ajaxContentH +"px"; - $("#TB_ajaxContent")[0].scrollTop = 0; - $("#TB_ajaxWindowTitle").html(caption); - } - } - - $("#TB_closeWindowButton").click(tb_remove); - $("#TB_cancelWindowButton").click(tb_remove); - - if(url.indexOf('TB_inline') != -1){ - $("#TB_ajaxContent").append($('#' + params['inlineId']).children()); - $("#TB_window").unload(function () { - $('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished - }); - tb_position(); - $("#TB_load").remove(); - $("#TB_window").css({display:"block"}); - }else if(url.indexOf('TB_iframe') != -1){ - tb_position(); - if($.browser.safari){//safari needs help because it will not fire iframe onload - $("#TB_load").remove(); - $("#TB_window").css({display:"block"}); - } - }else{ - $("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method - tb_position(); - $("#TB_load").remove(); - tb_init("#TB_ajaxContent a.thickbox"); - $("#TB_window").css({display:"block"}); - }); - } - - } - - if(!params['modal']){ - document.onkeyup = function(e){ - if (e == null) { // ie - keycode = event.keyCode; - } else { // mozilla - keycode = e.which; - } - if(keycode == 27){ // close - tb_remove(); - } - }; - } - - } catch(e) { - //nothing here - } -} - -//helper functions below -function tb_showIframe(){ - $("#TB_load").remove(); - $("#TB_window").css({display:"block"}); -} - -function tb_remove() { - $("#TB_imageOff").unbind("click"); - $("#TB_closeWindowButton").unbind("click"); - $("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();}); - $("#TB_load").remove(); - if (typeof document.body.style.maxHeight == "undefined") {//if IE 6 - $("body","html").css({height: "auto", width: "auto"}); - $("html").css("overflow",""); - } - document.onkeydown = ""; - document.onkeyup = ""; - return false; -} - -function tb_position() { -$("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); - if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6 - $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); - } -} - -function tb_parseQuery ( query ) { - var Params = {}; - if ( ! query ) {return Params;}// return empty object - var Pairs = query.split(/[;&]/); - for ( var i = 0; i < Pairs.length; i++ ) { - var KeyVal = Pairs[i].split('='); - if ( ! KeyVal || KeyVal.length != 2 ) {continue;} - var key = unescape( KeyVal[0] ); - var val = unescape( KeyVal[1] ); - val = val.replace(/\+/g, ' '); - Params[key] = val; - } - return Params; -} - -function tb_getPageSize(){ - var de = document.documentElement; - var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth; - var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight; - arrayPageSize = [w,h]; - return arrayPageSize; -} - -function tb_detectMacXFF() { - var userAgent = navigator.userAgent.toLowerCase(); - if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) { - return true; - } -} - - - -function tb_resize(width1,height1){ - TB_WIDTH = parseInt(width1) + 30 || 630; //defaults to 630 if no paramaters were added to URL - TB_HEIGHT = (parseInt(height1)*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL - ajaxContentW = TB_WIDTH - 30; - ajaxContentH = TB_HEIGHT - 45; - - $("#TB_ajaxContent")[0].style.width=(ajaxContentW + 29)+'px'; - $("#TB_ajaxContent")[0].style.height=(ajaxContentH + 17)+'px'; - tb_position(); - +/* + * Thickbox 3.1 - One Box To Rule Them All. + * By Cody Lindley (http://www.codylindley.com) + * Copyright (c) 2007 cody lindley + * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php +*/ + +var tb_pathToImage = "images/loadingAnimation.gif"; + +/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/ + +//on page load call tb_init +$(document).ready(function(){ + tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox + imgLoader = new Image();// preload image + imgLoader.src = tb_pathToImage; +}); + +function tb_reinit() { + $('a.thickbox, area.thickbox, input.thickbox').unbind("click"); + tb_init('a.thickbox, area.thickbox, input.thickbox'); +} + +//add thickbox to href & area elements that have a class of .thickbox +function tb_init(domChunk){ + $(domChunk).click(function(){ + var t = this.title || this.name || null; + var a = this.href || this.alt; + var g = this.rel || false; + tb_show(t,a,g); + this.blur(); + return false; + }); +} + +function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link + + try { + if (typeof document.body.style.maxHeight === "undefined") {//if IE 6 + $("body","html").css({height: "100%", width: "100%"}); + $("html").css("overflow","hidden"); + if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6 + $("body").append("
"); + $("#TB_overlay").click(tb_remove); + } + }else{//all others + if(document.getElementById("TB_overlay") === null){ + $("body").append("
"); + $("#TB_overlay").click(tb_remove); + } + } + + if(tb_detectMacXFF()){ + $("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash + }else{ + $("#TB_overlay").addClass("TB_overlayBG");//use background and opacity + } + + if(caption===null){caption="";} + $("body").append("
");//add loader to the page + $('#TB_load').show();//show loader + + var baseURL; + if(url.indexOf("?")!==-1){ //ff there is a query string involved + baseURL = url.substr(0, url.indexOf("?")); + }else{ + baseURL = url; + } + + var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/; + var urlType = baseURL.toLowerCase().match(urlString); + + if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images + + TB_PrevCaption = ""; + TB_PrevURL = ""; + TB_PrevHTML = ""; + TB_NextCaption = ""; + TB_NextURL = ""; + TB_NextHTML = ""; + TB_imageCount = ""; + TB_FoundURL = false; + if(imageGroup){ + TB_TempArray = $("a[@rel="+imageGroup+"]").get(); + for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) { + var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); + if (!(TB_TempArray[TB_Counter].href == url)) { + if (TB_FoundURL) { + TB_NextCaption = TB_TempArray[TB_Counter].title; + TB_NextURL = TB_TempArray[TB_Counter].href; + TB_NextHTML = "  Next >"; + } else { + TB_PrevCaption = TB_TempArray[TB_Counter].title; + TB_PrevURL = TB_TempArray[TB_Counter].href; + TB_PrevHTML = "  < Prev"; + } + } else { + TB_FoundURL = true; + TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length); + } + } + } + + imgPreloader = new Image(); + imgPreloader.onload = function(){ + imgPreloader.onload = null; + + // Resizing large images - orginal by Christian Montoya edited by me. + var pagesize = tb_getPageSize(); + var x = pagesize[0] - 150; + var y = pagesize[1] - 150; + + var imageWidth = imgPreloader.width; + var imageHeight = imgPreloader.height; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + } + } else if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + } + } + // End Resizing + + TB_WIDTH = imageWidth + 30; + TB_HEIGHT = imageHeight + 60; + $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); + + $("#TB_closeWindowButton").click(tb_remove); + $("#TB_cancelWindowButton").click(tb_remove); + + if (!(TB_PrevHTML === "")) { + function goPrev(){ + if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);} + $("#TB_window").remove(); + $("body").append("
"); + tb_show(TB_PrevCaption, TB_PrevURL, imageGroup); + return false; + } + $("#TB_prev").click(goPrev); + } + + if (!(TB_NextHTML === "")) { + function goNext(){ + $("#TB_window").remove(); + $("body").append("
"); + tb_show(TB_NextCaption, TB_NextURL, imageGroup); + return false; + } + $("#TB_next").click(goNext); + + } + + document.onkeydown = function(e){ + if (e == null) { // ie + keycode = event.keyCode; + } else { // mozilla + keycode = e.which; + } + if(keycode == 27){ // close + tb_remove(); + } else if(keycode == 190){ // display previous image + if(!(TB_NextHTML == "")){ + document.onkeydown = ""; + goNext(); + } + } else if(keycode == 188){ // display next image + if(!(TB_PrevHTML == "")){ + document.onkeydown = ""; + goPrev(); + } + } + }; + + tb_position(); + $("#TB_load").remove(); + $("#TB_ImageOff").click(tb_remove); + $("#TB_window").css({display:"block"}); //for safari using css instead of show + }; + + imgPreloader.src = url; + }else{//code to show html + + var queryString = url.replace(/^[^\?]+\??/,''); + var params = tb_parseQuery( queryString ); + + TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL + TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL + + ajaxContentW = TB_WIDTH - 30; + ajaxContentH = TB_HEIGHT - 45; + + if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window + urlNoQuery = url.split('TB_'); + $("#TB_iframeContent").remove(); + if(params['modal'] != "true"){//iframe no modal + $("#TB_window").append("
"+caption+"
close or Esc Key
"); + }else{//iframe modal + $("#TB_overlay").unbind(); + $("#TB_window").append(""); + } + }else{// not an iframe, ajax + if($("#TB_window").css("display") != "block"){ + if(params['modal'] != "true"){//ajax no modal + $("#TB_window").append("
"+caption+"
close or Esc Key
"); + }else{//ajax modal + $("#TB_overlay").unbind(); + $("#TB_window").append("
"); + } + }else{//this means the window is already up, we are just loading new content via ajax + $("#TB_ajaxContent")[0].style.width = ajaxContentW +"px"; + $("#TB_ajaxContent")[0].style.height = ajaxContentH +"px"; + $("#TB_ajaxContent")[0].scrollTop = 0; + $("#TB_ajaxWindowTitle").html(caption); + } + } + + $("#TB_closeWindowButton").click(tb_remove); + $("#TB_cancelWindowButton").click(tb_remove); + + if(url.indexOf('TB_inline') != -1){ + $("#TB_ajaxContent").append($('#' + params['inlineId']).children()); + $("#TB_window").unload(function () { + $('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished + }); + tb_position(); + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); + }else if(url.indexOf('TB_iframe') != -1){ + tb_position(); + if($.browser.safari){//safari needs help because it will not fire iframe onload + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); + } + }else{ + $("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method + tb_position(); + $("#TB_load").remove(); + tb_init("#TB_ajaxContent a.thickbox"); + $("#TB_window").css({display:"block"}); + }); + } + + } + + if(!params['modal']){ + document.onkeyup = function(e){ + if (e == null) { // ie + keycode = event.keyCode; + } else { // mozilla + keycode = e.which; + } + if(keycode == 27){ // close + tb_remove(); + } + }; + } + + } catch(e) { + //nothing here + } +} + +//helper functions below +function tb_showIframe(){ + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); +} + +function tb_remove() { + $("#TB_imageOff").unbind("click"); + $("#TB_closeWindowButton").unbind("click"); + $("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();}); + $("#TB_load").remove(); + if (typeof document.body.style.maxHeight == "undefined") {//if IE 6 + $("body","html").css({height: "auto", width: "auto"}); + $("html").css("overflow",""); + } + document.onkeydown = ""; + document.onkeyup = ""; + return false; +} + +function tb_position() { +$("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); + if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) { // take away IE6 + $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); + } +} + +function tb_parseQuery ( query ) { + var Params = {}; + if ( ! query ) {return Params;}// return empty object + var Pairs = query.split(/[;&]/); + for ( var i = 0; i < Pairs.length; i++ ) { + var KeyVal = Pairs[i].split('='); + if ( ! KeyVal || KeyVal.length != 2 ) {continue;} + var key = unescape( KeyVal[0] ); + var val = unescape( KeyVal[1] ); + val = val.replace(/\+/g, ' '); + Params[key] = val; + } + return Params; +} + +function tb_getPageSize(){ + var de = document.documentElement; + var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth; + var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight; + arrayPageSize = [w,h]; + return arrayPageSize; +} + +function tb_detectMacXFF() { + var userAgent = navigator.userAgent.toLowerCase(); + if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) { + return true; + } +} + + + +function tb_resize(width1,height1){ + TB_WIDTH = parseInt(width1) + 30 || 630; //defaults to 630 if no paramaters were added to URL + TB_HEIGHT = (parseInt(height1)*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL + ajaxContentW = TB_WIDTH - 30; + ajaxContentH = TB_HEIGHT - 45; + + $("#TB_ajaxContent")[0].style.width=(ajaxContentW + 29)+'px'; + $("#TB_ajaxContent")[0].style.height=(ajaxContentH + 17)+'px'; + tb_position(); + } \ No newline at end of file diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..1d7e677b34cac84ef0fafbbddbda1bcb71d55cb8 GIT binary patch literal 4937 zcmaKvO^h5z6~`-y6JQ|_Lck$`PzK|5lAYO)#IZ9@VwUxqY*>3&>$M3SfST@_op$q<|n2QUn5t9FYhI_`T|$*;(63NxlEB z=~u7b`@fH>ef{1;FDb?;o{#bT`8K82!0+9`AI58klzJcdNAO+X-b>pdVT=Pe!l@f3I4wM{oi1V`GXia z3$B12a0irqehPjF{2eH~{1p`We}JOzFdrp;M?v{M4GRCW&HM?Fkf~=tN>M$|BfJaO zBG2}LA0Q0LDH) zb$rD~;X{VR_XN*JWzr0ZDWMHRcpMG!N#ZC&c$Oh~d4%T>&tp6?B$f|{H>FO3GdzSk z49VBgkXn&?mzq4qBef^|j)%^RQhQtKYH&m?MrBguS}n%0zF@cYC2t**EXno2Y}xwt zj9N0etlDDL(4>{sy~61#k8Ll>ZLD9gJNo!YNL0UrP~YTRR;T=}*r219iYkqRO;M5O zHY#;l=v)7~dUkOg%iYkrwmMtroubmtnl#aw4BT_Ji#Eyqb&yS1Ee zrHSvW<-D{G_q^XOTpV19f>mA@dAg&{Ih#j)wUXmS66>_sf{m54ZLQZ+YdqTBjy78+ z$=hS0k+ydfDxJxFY69b~s7iZ8J!gjIV&sxRsk6$Lx@)z~O*e&9HpM(F6|Tiqc)=yT zw6?Lh+Sbn&+ZG~bH12t8Gp{Ff;k`}DK8xeT*XmFb0$&XVg)7nD-4U%$cU`d!Q*FID zp?{_^V^S##0#8Z4bzr3~2I7*Rfp(j#RpG1t3v1(-+P}<{QD5Z7v^J?I?#j+FkF;%q$ru`_=2Ixd3iVQq8A$F+Jk!bnQqceldiMvsK}m~T5bAtYtx#nqsQ}(?zyj= z+n74Pa(;Q=gZcK{RFmng&7A>um-cEoJCJQoOY?9X4o_d&Jl8t4FDGX8tZOajQ4tfO zjy}~*%BkmDpR>6QHHp1N;C;S*vVDRt^|bX_@^@g$en-y^jho%x-kx15oJnU*RraUW zQ;H>Rohw}CJ31ePsegLmw60&DKA!7m^!&r8_Z42GA4YbmwzH#aL&w`)w8lmKbvA6x zb#!}T+4#fq)hMlE8;ig#Y?{5|A)}%{`YCmRgxlMt3e#kK3|}a!p-pvFCY)3RzH+oN zj>~v@qDc|$(Yd^m4GL11c0tW*x3?QrgS}lRMUh(_rF**+LAliG1q*QYgS_2hC()kqhTBO9r`>&No0ADn(iAycu4@_^+5GjQZDN`|%J%VCV z9CyMQ6SQ#Bn|$wOS$m<#AbCP7yhVj`I5#7_N@?!cYi%r;Q2jPCs}R$-a);u8_UuSk zaVD<9UCZly+H%rkoLrNV_~0!dF6b|Nuiyzyt4xMOFqmDNhUd-kzvd>7W>H9({b&i@ zd4Ct-lOta=8K;MZ=+4bB*$N5PmOd~dbfkZ#-W)b3E)`aY75?R}MOGX*k%aFXRnO=_ z1-EpB++LNey@_Q7RryWSPjCP|oVzb_<0N-(maJL9vzR6lh#uV^ZrVyN1X4*&(l+)` zZYVwwRk7(n0tvY}r6oDQ9piv7*At?PIJb;Z!b#;x>i9vy4H>QowK{KIlr+1`#RI0( z$)ctvNUo6(8~H?H<#o+KAYD>iGAZHI6utFjqE(s!feLxOpPSr9q~C4@NioicD}&9e za0fZRx0@9%k&`o{58cG9T1hpRTq&k-9ohSFMhJ#Bx;gMt$>aM7hSXUw(XWDQjXqo5 zTBTe?gq@gNk!sW2OI8omqmgDwq;0QfqP^YrtyAa5SY6uh6JENFm)b%-#d2lu`lx@Q zmeURoZxCtPo8%Xri`$CO5W1FBF?3uDWlSI|u8z{N$#QX{Cy7G)N=+jjb5|E?FkruD zdYQs7t3|rV2Bn>;O_-1$B>\n" +"Language-Team: \n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.7.5\n" +"X-Poedit-Basepath: /var/www/Coral/auth\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-SearchPath-0: .\n" +"X-Poedit-SearchPathExcluded-0: /var/www/Coral/auth/js/plugins\n" + +#: LangCodes.php:16 +msgid "French" +msgstr "Français" + +#: LangCodes.php:17 +msgid "English" +msgstr "Anglais" + +#: admin.php:66 index.php:192 +msgid "" +"JavaScript must be enabled in order for you to use CORAL. However, it seems " +"JavaScript is either disabled or not supported by your browser. To use " +"CORAL, enable JavaScript by changing your browser options, then" +msgstr "" +"JavaScript doit être activé pour utiliser CORAL. Or JavaScript est " +"désactivé ou n'est pas supporté par votre navigateur. Pour utiliser CORAL, " +"activez JavaScript en modifiant la configuration de votre navigateur, puis" + +#: admin.php:66 index.php:192 +msgid "try again" +msgstr "réessayez" + +#: admin.php:80 +msgid "Users" +msgstr "Utilisateurs" + +#: admin.php:81 +msgid "Login ID must match the login ID set up in the modules" +msgstr "" +"Le nom d'utilisateur doit être identique au nom d'utilisateur utilisé dans " +"les modules" + +#: admin.php:87 +msgid "Processing..." +msgstr "En traitement ..." + +#: admin.php:91 index.php:217 +msgid "Change language:" +msgstr "Changer la langue:" + +#: admin.php:107 index.php:233 +msgid "Invalid translation route!" +msgstr "Le chemin vers les traductions n'est pas valide!" + +#: admin.php:132 +msgid "Login page" +msgstr "Page de connexion" + +#: admin/classes/common/DBService.php:39 +msgid "There was a problem with the database: " +msgstr "Il y a eu un problème avec la base de données : " + +#: admin/classes/common/LdapPerson.php:34 +msgid "Could not connect to " +msgstr "Impossible de se connecter à :" + +#: admin/classes/common/Object.php:63 +msgid "Cannot set value for undefined key (" +msgstr "Impossible d'assigner une clé indéfinie (" + +#: admin/classes/common/Object.php:72 +msgid "Cannot get value for undefined key (" +msgstr "Impossible de récupérer une clé indéfinie (" + +#: admin/classes/domain/User.php:82 admin/classes/domain/User.php:89 +msgid "Could not connect to LDAP server." +msgstr "Impossible de se connecter au serveur LDAP." + +#: admin/classes/domain/User.php:97 +msgid "" +"There is a problem with the LDAP configuration, contact your server " +"administrator." +msgstr "" +"Il y a un problème avec la configuration LDAP, contactez votre " +"administrateur." + +#: ajax_forms.php:43 +msgid "Edit User" +msgstr "Modifier utilisateur" + +#: ajax_forms.php:43 +msgid "Add New User" +msgstr "Nouvel utilisateur" + +#: ajax_forms.php:56 +msgid "Login ID" +msgstr "Nom d'utilisateur" + +#: ajax_forms.php:58 +msgid "Enter password for changes only" +msgstr "Entrez un mot de passe seulement pour le modifier" + +#: ajax_forms.php:59 +msgid "New " +msgstr "Nouveau " + +#: ajax_forms.php:59 +msgid "Password" +msgstr "Mot de passe" + +#: ajax_forms.php:62 +msgid "Reenter Password" +msgstr "Re-tapez le mot de passe" + +#: ajax_forms.php:65 +msgid "Admin?" +msgstr "Admin?" + +#: ajax_forms.php:77 +msgid "submit" +msgstr "Valider" + +#: ajax_forms.php:78 +msgid "cancel" +msgstr "Annuler" + +#: ajax_forms.php:114 ajax_htmldata.php:75 ajax_processing.php:89 +msgid "Action " +msgstr "Action " + +#: ajax_forms.php:114 ajax_htmldata.php:75 ajax_processing.php:89 +msgid " not set up!" +msgstr "Non établi" + +#: ajax_htmldata.php:53 +msgid "edit password or admin status" +msgstr "modifier le mot de passe ou le statut d`admin" + +#: ajax_htmldata.php:54 +msgid "remove" +msgstr "Effacer" + +#: ajax_htmldata.php:60 ajax_htmldata.php:64 +msgid "add new user" +msgstr "Ajouter utilisateur" + +#: ajax_processing.php:77 +msgid "User successfully deleted." +msgstr "L'utilisateur a été effacé." + +#: index.php:55 +msgid "You are successfully logged out of the system." +msgstr "Vous êtes déconnecté du système." + +#: index.php:86 +msgid "Invalid login ID. Please try again." +msgstr "Nom d'utilisateur incorrect, réessayez." + +#: index.php:91 +msgid "Invalid password. Please try again." +msgstr "Mot de passe incorrect, réessayez." + +#: index.php:107 +msgid "You are already logged in as " +msgstr "Vous êtes déjà connecté comme " + +#: index.php:107 +msgid "You may log in as another user below," +msgstr "Vous devez vous connecter sous un autre compte," + +#: index.php:107 +msgid "return" +msgstr "Retour" + +#: index.php:107 +msgid "or" +msgstr "ou" + +#: index.php:107 +msgid "logout" +msgstr "déconnecter" + +#: index.php:128 +msgid "Please enter login credentials to sign in." +msgstr "Merci de saisir vos identifiants" + +#: index.php:136 +msgid "Your session has timed out." +msgstr "Votre session a expiré." + +#: index.php:145 +msgid "You do not have permission to enter." +msgstr "Vous n'avez pas l'autorisation de faire cela." + +#: index.php:145 +msgid "Please contact an administrator." +msgstr "Merci de contacter l'administrateur." + +#: index.php:155 +msgid "You must log in before accessing the admin page." +msgstr "Vous devez vous identifier avant d'accéder à cette page." + +#: index.php:202 +msgid "Login ID:" +msgstr "Nom d'utilisateur:" + +#: index.php:205 +msgid "Password:" +msgstr "Mot de passe:" + +#: index.php:209 +msgid "Remember my login ID" +msgstr "Mémoriser mon nom d'utilisateur" + +#: index.php:213 +msgid "Login" +msgstr "Connexion" + +#: index.php:258 +msgid "Admin page" +msgstr "Page d'administration" + +#: js/admin.js:67 +msgid "Passwords do not match" +msgstr "Les mots de passe ne correspondent pas" + +#: js/admin.js:73 +msgid "Password is required" +msgstr "Le mot de passe est nécessaire" + +#: js/admin.js:78 +msgid "UserID is required" +msgstr "Le nom d'utilisateur est nécessaire" + +#: js/admin.js:89 +msgid "Do you really want to delete this user?" +msgstr "Voulez-vous vraiment supprimer cet utilisateur?" + +#: js/index.js:40 +msgid "Refreshing Contents..." +msgstr "Rechargements des contenus..." + +#~ msgid "Spanish" +#~ msgstr "Espagnol" + +#~ msgid "Italian" +#~ msgstr "Italien" + +#~ msgid "French, FR" +#~ msgstr "Français, FR" + +#~ msgid "English, US" +#~ msgstr "Anglais, US" + +#~ msgid "Spanish, MX" +#~ msgstr "Espagnol, MX" From 269f75335ee7a47120767f283dcec384b754bc1c Mon Sep 17 00:00:00 2001 From: Ryan Chisum Date: Mon, 14 Mar 2016 11:13:23 -0600 Subject: [PATCH 05/18] Language Selection Fixes for Login Screen --- .DS_Store | Bin 6148 -> 10244 bytes css/style.css | 8 ++++++++ 2 files changed, 8 insertions(+) diff --git a/.DS_Store b/.DS_Store index 1001fa5e7baa527d3eeff8ce227fcde59965fb16..7df5008615bb9b06f5038e226cc3e3895e97ffd9 100644 GIT binary patch literal 10244 zcmeHMU2GIp6h3EL+PP3;{aIR&I=eHpgR?X1&TO~X z5No2*2Q~fx!iy1JOo%2vh>5-!A2do#^Z^ry`eKZUPbTUEZ+Py#vt@U>eegvMnY)>L z?mhRM`}55=d-lu%0CpGk4uCiSD0FeDHc?fh@Ns_4DG^`ON)pK*4p>e$V>ub>t8=VF zMTkI%K!`wyK!`wy!2baOirKsiTv)av+i|eLfdUu-pKk&_jC>}* z0}ZnDF~9}4+5?XUJQk3x4mn!G4p`m{ShBm8v`U`V$ya+sP6j;gBahQ`O~DwP68q25 zj%xe<67X%V@Z~4Ufkpe&#Mx@j035%I75FW!m?2NtIb}rnSqahFvv5Q!XK92UI0F4J z0tes;=&L@lK(o@ij@FoqIY+XFRi@sa&nDv29qrq;C*nIhx1Bw! zC@b4K_a02!({G(Sf8p(mmp-C%Qb9jxK(p-6*4L=zBV@Ug{qpP)XYSeAqG+nMci)(* z7G2}0VQHQ@X{0pIpv^9E36KL>$M!d!&N@~xXVXY?Ro-Wi6~VJ;_nA zjG>aLdlMs?n>B3Rw8uy3PS~D#$}|eB8E>;eTgw^JYejS=Q?Dr}blT2gN9Q)W7>TZk zu2z)eT;EeLsFrFLkFI5^rVP5YH95t4*2Ywq4L(gbOS*1k2}RY}kfmh|OR64W9g2F8 zr6=Y7rE)9Vt~6tU9m_ho9PQAR>Rr*@iu#pulCOP8bG;*Z!=~jQ+p|}tU3JfQN<|sr z9$mU_=*qg}26;c%CEH~~CBREPAfDI*h1zv^M;1XPctMDOw3SYpN@HJeA zZ{a4~f*;^V_znJmKjAL~WVjHUa51*vD!d=p-~;#|Zo|L@S|>*ZFLkCakfX#%&SkY;j_zW_#Dh$2 zkfVE8QanE@$o~3RiYY4AAltlDyG%s;glKjhzJu@KC-@nDhucK122^o5uD}?PYc)QE zZTK*5!~|}`?YI+n;clWjXGkSLZWl4Xcw2A;wRdgU{m&_#(bU zlzRi;#B+Ea-wBXyf0<@d;(K?=HaSqREyo@w4X5T}ie@H{==8vNA~v3>9g##-t&AQG zt^HqPUFbv%mjC|YUDM6A=va;o<1JZhp+5j7iyhb!W&1y=R^K+#eB^v64QXeFMI zoDS}R$Hb}`8{jDPLKmdqF!WZ>hZGsBY{jHu6(SHK5F!vF5F&67Ay6mJ66f##d*}cE z{~kJVc$5%<5P={9Sf3h5b(6N7p#}~3yY@I;PtnB-x0{htxKJft$CDJVS{xecii^{+MXF!<$|HGG1Vg7%Q<^O*JAkrq_ delta 105 zcmZn(XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$SANeU^g?Pz-Ar+R;JCO65kjX rvvY6=G6R(WfdDs(44dP5<}d>QcdQTq diff --git a/css/style.css b/css/style.css index 42c6d33..a89438d 100644 --- a/css/style.css +++ b/css/style.css @@ -380,3 +380,11 @@ a#addUser:hover { .bordered .smallDarkRedText { margin-bottom: 10px !important; } + +p.fontText { + margin-top: 10px; +} + +.boxRight select#lang { + float: none; +} From 0d1da2dcebf7a9387a7f28b8f5b46fea6443c8be Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Mon, 4 Apr 2016 14:33:18 -0600 Subject: [PATCH 06/18] Language Normalization in Drop-down --- LangCodes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LangCodes.php b/LangCodes.php index 1f51904..18b5eb2 100644 --- a/LangCodes.php +++ b/LangCodes.php @@ -13,8 +13,8 @@ public function getLanguage($code){ } public function getNameLang($code_lang){ $name_lang=array( - 'fr'=>_('French'), - 'en'=>_('English') + 'fr'=>'Français', + 'en'=>'English' ); return $name_lang[$code_lang]; } From f572ae651d123986c89ff3bdb22540220118af32 Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Wed, 6 Apr 2016 08:03:01 -0600 Subject: [PATCH 07/18] New French Translations --- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4937 -> 5207 bytes locale/fr_FR/LC_MESSAGES/messages.po | 88 ++++++++++++++------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index 1d7e677b34cac84ef0fafbbddbda1bcb71d55cb8..bec110a70e34a0618db3a9751ddbabf72bd00aa8 100644 GIT binary patch delta 1470 zcmaizPiS049LJ|dXp(OBUu&y|*ojG#g4xYd+GLZ6CA1Y%t$z{?*dj9fc3P&qH}g7w zUSlqM(wiO}5ER6Eva6y}Tf8as9kd70gV2KqJ$NX1^eWneUtF+v^#SHLI0^I!vf z6FdZd4TiWsf=%!)I0BX-x&l60B%NO1O&rYN;4Sb^@FoZia=k=I1-u1b0KWtGgHz@H z`64)s{TdkVuY-rd*Fc0I9Wcaw8$1Hu0?&ZIfCs_JN{5h#v1mdiTznBc3T}bt!H>XW z;9uYrIA0}X8r%Sb;1(F}zX3MD&%ssjS1?pKiEN(%Uj>6s7Yq*H27@!dEn#sSi+dn6 z$OL?S0GtQIg=1i_Z2A8FG&qX=vj@Ix=%q zecw+}sbsC4cP|Pl=p4Vm4(Q>_~eCJbs&3{ukwEvuHi;DuE@F-^TlH=4bj!g{Z*QjrfT_{3h z_llGLgR!}elj4fw373|p3L-H#H0gzjSjg0nr!|xL$4nUVoJx>{vmzFT*^rWu$W63) zoo;d`;+St!op-r0>~&-TS*cvcnX5zB(l)0lGlma5oBY3br~Jv{_{fe9^_Pn$W>4{y z%QlmCj*6HXo&?8G1wG3$wh?KOT56Q=Ulf-fq*r;%-zzppQI|@475VwncwvLnNJ+^f zG{J9_)<;sNS(10H_MeuH?4kar(o>J9RxBim%s|g?_@mKfCpij1^OdZVmoyW$-xDtJz-d#j*U37s zS(d_LRGTRK%C4Vbs2uu$ri8d{lnND$k27>Iz`4AeC@l;!OK|5uGxL9!pC1m&Aar86V#9%ipflrl4$5bgwaFQz4i96AM{PMT#LY zu;rcV+!9Whvmveiyiv`sIOJ&h{xC%EwvjP&)WDT`KNP(4FH~pu(MZ%#uR(Z!wYpM) z_X9nF8~#RhdKmv$n8VorTwPfk_>K`Kr}OU4AZ*t%#39PTYKxxhK)5flIwLcMnI^mA Hy-ofBxzM2x delta 1177 zcmZwFKWI}y90%~LLaVjOOB$ucPj)vNhmbB9!d@7|4e$!=gty@sya%_#_t52aBnTOT>!F)3L6^tjdUyl6b05G7_z13r zOK=2!Pmo2j1%tjMA>(iweuM#ZiHAHw((oia4Xe;y{B(K#EnI_m38E(Q4GzMe5Ov*mh%^)m3l^x`Z5bpI~e`-UYi6@5?;C zwR*5CRm_i1=66ieiQQ8>$G4A9*w@`}R!lo z>=)+4ROe86diQ`KzvalP44Tv;#CXTSC&yRcf5?Kpkl9FsM!Xu$BuTFh-JG1xgQ z=XHG=!vPy7X1Zs{(WoM-0(+h(MmK662R!7`(0UYOE2rU~WiL6n*N>Fqz8Q6QbFJA0 zezAZ9j4P+kwB}UE|K=Rw)VJ4@*_6z2jl-Fy3oH;7ZXYF!sj{Mn*aAD@D^WL;Yn${+ z_OQ3xW7LmiRn%g|Tqo=`FT3_YBqcxZq9@*5XKX|uwDnS3Z85d4U!o_jFroNAb=j+_ zJ&Qq(RYD&Xa zDRVzVvq5>a%KT=-9`DVr`SX(2^ybrk6o#CVQ&FsG^MOJ0Ui6L*\n" "Language-Team: \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.7.5\n" +"X-Generator: Poedit 1.8.7\n" "X-Poedit-Basepath: /var/www/Coral/auth\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -30,9 +30,10 @@ msgid "" "JavaScript is either disabled or not supported by your browser. To use " "CORAL, enable JavaScript by changing your browser options, then" msgstr "" -"JavaScript doit être activé pour utiliser CORAL. Or JavaScript est " -"désactivé ou n'est pas supporté par votre navigateur. Pour utiliser CORAL, " -"activez JavaScript en modifiant la configuration de votre navigateur, puis" +"JavaScript doit être activé pour utiliser CORAL. Cependant, il semble que " +"JavaScript soit désactivé ou n'est pas supporté par votre navigateur web. " +"Pour utiliser CORAL, activez JavaScript en modifiant les options de votre " +"navigateur, puis" #: admin.php:66 index.php:192 msgid "try again" @@ -45,20 +46,20 @@ msgstr "Utilisateurs" #: admin.php:81 msgid "Login ID must match the login ID set up in the modules" msgstr "" -"Le nom d'utilisateur doit être identique au nom d'utilisateur utilisé dans " -"les modules" +"Le nom d'utilisateur doit être identique au nom d'utilisateur paramétré " +"dans les modules" #: admin.php:87 msgid "Processing..." -msgstr "En traitement ..." +msgstr "Traitement en cours..." #: admin.php:91 index.php:217 msgid "Change language:" -msgstr "Changer la langue:" +msgstr "Modifier la langue :" #: admin.php:107 index.php:233 msgid "Invalid translation route!" -msgstr "Le chemin vers les traductions n'est pas valide!" +msgstr "Chemin vers les traductions invalide !" #: admin.php:132 msgid "Login page" @@ -70,15 +71,15 @@ msgstr "Il y a eu un problème avec la base de données : " #: admin/classes/common/LdapPerson.php:34 msgid "Could not connect to " -msgstr "Impossible de se connecter à :" +msgstr "Impossible de se connecter à " #: admin/classes/common/Object.php:63 msgid "Cannot set value for undefined key (" -msgstr "Impossible d'assigner une clé indéfinie (" +msgstr "Impossible d'attribuer une valeur à une clé indéfinie (" #: admin/classes/common/Object.php:72 msgid "Cannot get value for undefined key (" -msgstr "Impossible de récupérer une clé indéfinie (" +msgstr "Impossible d'obtenir la valeur d'une clé indéfinie (" #: admin/classes/domain/User.php:82 admin/classes/domain/User.php:89 msgid "Could not connect to LDAP server." @@ -90,15 +91,15 @@ msgid "" "administrator." msgstr "" "Il y a un problème avec la configuration LDAP, contactez votre " -"administrateur." +"administrateur de serveur." #: ajax_forms.php:43 msgid "Edit User" -msgstr "Modifier utilisateur" +msgstr "Modifier un utilisateur" #: ajax_forms.php:43 msgid "Add New User" -msgstr "Nouvel utilisateur" +msgstr "Ajouter un nouvel utilisateur" #: ajax_forms.php:56 msgid "Login ID" @@ -106,7 +107,7 @@ msgstr "Nom d'utilisateur" #: ajax_forms.php:58 msgid "Enter password for changes only" -msgstr "Entrez un mot de passe seulement pour le modifier" +msgstr "Entrez un mot de passe uniquement pour les modifications" #: ajax_forms.php:59 msgid "New " @@ -122,11 +123,11 @@ msgstr "Re-tapez le mot de passe" #: ajax_forms.php:65 msgid "Admin?" -msgstr "Admin?" +msgstr "Admin ?" #: ajax_forms.php:77 msgid "submit" -msgstr "Valider" +msgstr "Envoyer" #: ajax_forms.php:78 msgid "cancel" @@ -138,47 +139,47 @@ msgstr "Action " #: ajax_forms.php:114 ajax_htmldata.php:75 ajax_processing.php:89 msgid " not set up!" -msgstr "Non établi" +msgstr " non-défini !" #: ajax_htmldata.php:53 msgid "edit password or admin status" -msgstr "modifier le mot de passe ou le statut d`admin" +msgstr "modifier le mot de passe ou le statut administrateur" #: ajax_htmldata.php:54 msgid "remove" -msgstr "Effacer" +msgstr "Retirer" #: ajax_htmldata.php:60 ajax_htmldata.php:64 msgid "add new user" -msgstr "Ajouter utilisateur" +msgstr "Ajouter un nouvel utilisateur" #: ajax_processing.php:77 msgid "User successfully deleted." -msgstr "L'utilisateur a été effacé." +msgstr "Utilisateur supprimé avec succès." #: index.php:55 msgid "You are successfully logged out of the system." -msgstr "Vous êtes déconnecté du système." +msgstr "Vous êtes à présent déconnecté du système." #: index.php:86 msgid "Invalid login ID. Please try again." -msgstr "Nom d'utilisateur incorrect, réessayez." +msgstr "Nom d'utilisateur invalide. Veuillez réessayer à nouveau." #: index.php:91 msgid "Invalid password. Please try again." -msgstr "Mot de passe incorrect, réessayez." +msgstr "Mot de passe invalide. Veuillez réessayer à nouveau." #: index.php:107 msgid "You are already logged in as " -msgstr "Vous êtes déjà connecté comme " +msgstr "Vous êtes déjà connecté en tant que " #: index.php:107 msgid "You may log in as another user below," -msgstr "Vous devez vous connecter sous un autre compte," +msgstr "Vous pouvez vous connecter sous un autre compte ci-dessous," #: index.php:107 msgid "return" -msgstr "Retour" +msgstr "Retourner" #: index.php:107 msgid "or" @@ -186,11 +187,11 @@ msgstr "ou" #: index.php:107 msgid "logout" -msgstr "déconnecter" +msgstr "Déconnectez-vous" #: index.php:128 msgid "Please enter login credentials to sign in." -msgstr "Merci de saisir vos identifiants" +msgstr "Merci d'entrer vos identifiants de connexion pour ouvrir une session." #: index.php:136 msgid "Your session has timed out." @@ -198,31 +199,32 @@ msgstr "Votre session a expiré." #: index.php:145 msgid "You do not have permission to enter." -msgstr "Vous n'avez pas l'autorisation de faire cela." +msgstr "Vous n'avez pas les autorisations requises pour accéder au site." #: index.php:145 msgid "Please contact an administrator." -msgstr "Merci de contacter l'administrateur." +msgstr "Merci de contacter un administrateur." #: index.php:155 msgid "You must log in before accessing the admin page." -msgstr "Vous devez vous identifier avant d'accéder à cette page." +msgstr "" +"Vous devez vous identifier avant d'accéder à cette page d'administration." #: index.php:202 msgid "Login ID:" -msgstr "Nom d'utilisateur:" +msgstr "Nom d'utilisateur :" #: index.php:205 msgid "Password:" -msgstr "Mot de passe:" +msgstr "Mot de passe :" #: index.php:209 msgid "Remember my login ID" -msgstr "Mémoriser mon nom d'utilisateur" +msgstr "Mémoriser mes identifiants de connexion" #: index.php:213 msgid "Login" -msgstr "Connexion" +msgstr "Se connecter" #: index.php:258 msgid "Admin page" @@ -234,19 +236,19 @@ msgstr "Les mots de passe ne correspondent pas" #: js/admin.js:73 msgid "Password is required" -msgstr "Le mot de passe est nécessaire" +msgstr "Le mot de passe est obligatoire" #: js/admin.js:78 msgid "UserID is required" -msgstr "Le nom d'utilisateur est nécessaire" +msgstr "Le nom d'utilisateur est obligatoire" #: js/admin.js:89 msgid "Do you really want to delete this user?" -msgstr "Voulez-vous vraiment supprimer cet utilisateur?" +msgstr "Voulez-vous vraiment supprimer cet utilisateur ?" #: js/index.js:40 msgid "Refreshing Contents..." -msgstr "Rechargements des contenus..." +msgstr "Actualisation des contenus en cours..." #~ msgid "Spanish" #~ msgstr "Espagnol" From 0cd80fb7396eaae892a2101531f8eb0cde1eba0d Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Wed, 6 Apr 2016 09:53:14 -0600 Subject: [PATCH 08/18] Changes for additional languages --- LangCodes.php | 14 ++++++++++---- index.php | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/LangCodes.php b/LangCodes.php index 18b5eb2..089ab77 100644 --- a/LangCodes.php +++ b/LangCodes.php @@ -6,15 +6,21 @@ class LangCodes{ public function getLanguage($code){ $all_lang=array( - 'fr'=>'fr_FR', - 'en'=>'en_US' + 'fr_FR'=>'fr_FR', + 'en_US'=>'en_US', + 'zh_CN'=>'zh_CN', + 'zh_TW'=>'zh_TW', + 'de_DE'=>'de_DE' ); return $all_lang[$code]; } public function getNameLang($code_lang){ $name_lang=array( - 'fr'=>'Français', - 'en'=>'English' + 'fr_FR'=>'Français', + 'en_US'=>'English', + 'zh_CN'=>'中文 (中国)', + 'zh_TW'=>'中文 (台灣)', + 'de_DE'=>'Deutsch' ); return $name_lang[$code_lang]; } diff --git a/index.php b/index.php index 21dbb30..21606c7 100644 --- a/index.php +++ b/index.php @@ -241,15 +241,15 @@ for($i=0; $i".$lang_name->getNameLang(substr($lang[$i],0,2)).""; + echo ""; }else{ - echo ""; + echo ""; } }else{ if($defLang==substr($lang[$i],0,2)){ - echo ""; + echo ""; }else{ - echo ""; + echo ""; } } } From d0e5fab50744590300523e40baf99ce27336fb68 Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Thu, 7 Apr 2016 14:14:46 -0600 Subject: [PATCH 09/18] Fixed bindtextdomain path --- directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/directory.php b/directory.php index 9b21798..6d1fb1d 100644 --- a/directory.php +++ b/directory.php @@ -73,6 +73,6 @@ function lcfirst($string) { } putenv("LC_ALL=$http_lang"); setlocale(LC_ALL, $http_lang.".utf8"); - bindtextdomain("messages", "./locale"); + bindtextdomain("messages", dirname(__FILE__) . "/locale"); textdomain("messages"); ?> \ No newline at end of file From 429baac73a5f69a322a530c464e574cce637ca47 Mon Sep 17 00:00:00 2001 From: Ryan Chisum Date: Fri, 8 Apr 2016 10:31:47 -0600 Subject: [PATCH 10/18] Adjusted Layout to Login Screen --- css/style.css | 44 +++++++++++++++++++++++++++++++++++++------- index.php | 17 ++++++++--------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index a89438d..4a55304 100644 --- a/css/style.css +++ b/css/style.css @@ -36,10 +36,9 @@ label{ margin-top: 5px; } -input, select, multiple, textarea{ +input, select, multiple, textarea { float: left; margin-top: 5px; - cursor: pointer; } @@ -309,15 +308,45 @@ label:nth-of-type(3) { color: #ccc; } -/*--- New Custom CSS ---*/ - #login-form { margin-top: 20px; + text-align: center; +} + +#login-form label { + width: 100%; + margin: 0; + font-size: 14px; +} + +#login-form input { + float: none; + margin-bottom: 10px; +} + +#login-form .smallText { + font-size: 12px; +} + +#login-form #loginbutton { + color: #FFFFFF; + font-family: "Arial", sans-serif; + font-size: 11px; + font-weight: normal; + background: #1b76a9; + border: none; + padding: 5px 10px; + text-transform: capitalize; + min-width: 60px; + margin-top: 10px; +} + +#login-form #loginbutton:hover { + cursor: pointer; } #login-form label:nth-of-type(1) { - margin: 110px 0 15px 0 !important; - text-align: center !important; + margin-bottom: 15px !important; } a#admin-link:before { @@ -382,7 +411,8 @@ a#addUser:hover { } p.fontText { - margin-top: 10px; + margin-top: 15px; + font-size: 14px; } .boxRight select#lang { diff --git a/index.php b/index.php index 21dbb30..e56a004 100644 --- a/index.php +++ b/index.php @@ -198,19 +198,18 @@
-
-
- - +
+
+ +
- - + +
- - />  + + />
-
From 30af909d77c6e2b43df218c63d343d6700e4afc9 Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Fri, 8 Apr 2016 11:00:34 -0600 Subject: [PATCH 11/18] Ryan Fixed Login Screen --- css/style.css | 44 +++++++++++++++++++++++++++++++++++++------- index.php | 17 ++++++++--------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index a89438d..4a55304 100644 --- a/css/style.css +++ b/css/style.css @@ -36,10 +36,9 @@ label{ margin-top: 5px; } -input, select, multiple, textarea{ +input, select, multiple, textarea { float: left; margin-top: 5px; - cursor: pointer; } @@ -309,15 +308,45 @@ label:nth-of-type(3) { color: #ccc; } -/*--- New Custom CSS ---*/ - #login-form { margin-top: 20px; + text-align: center; +} + +#login-form label { + width: 100%; + margin: 0; + font-size: 14px; +} + +#login-form input { + float: none; + margin-bottom: 10px; +} + +#login-form .smallText { + font-size: 12px; +} + +#login-form #loginbutton { + color: #FFFFFF; + font-family: "Arial", sans-serif; + font-size: 11px; + font-weight: normal; + background: #1b76a9; + border: none; + padding: 5px 10px; + text-transform: capitalize; + min-width: 60px; + margin-top: 10px; +} + +#login-form #loginbutton:hover { + cursor: pointer; } #login-form label:nth-of-type(1) { - margin: 110px 0 15px 0 !important; - text-align: center !important; + margin-bottom: 15px !important; } a#admin-link:before { @@ -382,7 +411,8 @@ a#addUser:hover { } p.fontText { - margin-top: 10px; + margin-top: 15px; + font-size: 14px; } .boxRight select#lang { diff --git a/index.php b/index.php index 21606c7..f2f6323 100644 --- a/index.php +++ b/index.php @@ -198,19 +198,18 @@
-
-
- - +
+
+ +
- - + +
- - />  + + />
-
From df12777a66a98c68c85c63d3e558030af60c93bf Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Mon, 11 Apr 2016 12:53:23 -0600 Subject: [PATCH 12/18] fixed changed default locale to get 5 characters instead of 2 --- LangCodes.php | 16 ++++++++-------- directory.php | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/LangCodes.php b/LangCodes.php index 089ab77..37b743c 100644 --- a/LangCodes.php +++ b/LangCodes.php @@ -7,20 +7,20 @@ class LangCodes{ public function getLanguage($code){ $all_lang=array( 'fr_FR'=>'fr_FR', - 'en_US'=>'en_US', - 'zh_CN'=>'zh_CN', - 'zh_TW'=>'zh_TW', - 'de_DE'=>'de_DE' + 'en_US'=>'en_US'//, + //'zh_CN'=>'zh_CN', + //'zh_TW'=>'zh_TW', + //'de_DE'=>'de_DE' ); return $all_lang[$code]; } public function getNameLang($code_lang){ $name_lang=array( 'fr_FR'=>'Français', - 'en_US'=>'English', - 'zh_CN'=>'中文 (中国)', - 'zh_TW'=>'中文 (台灣)', - 'de_DE'=>'Deutsch' + 'en_US'=>'English'//, + //'zh_CN'=>'中文 (中国)', + //'zh_TW'=>'中文 (台灣)', + //'de_DE'=>'Deutsch' ); return $name_lang[$code_lang]; } diff --git a/directory.php b/directory.php index 6d1fb1d..0c8e635 100644 --- a/directory.php +++ b/directory.php @@ -68,8 +68,10 @@ function lcfirst($string) { if(isset($_COOKIE["lang"])){ $http_lang = $_COOKIE["lang"]; }else{ - $codeL = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2); - $http_lang = $lang_name->getLanguage($codeL); + $codeL = str_replace("-","_",substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5)); + $http_lang = $lang_name->getLanguage($codeL); + if($http_lang == "") + $http_lang = "en_US"; } putenv("LC_ALL=$http_lang"); setlocale(LC_ALL, $http_lang.".utf8"); From 556a5ec0bb6916b3cf2e2f6405626cdb81b1a9a8 Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Wed, 4 May 2016 15:25:31 -0600 Subject: [PATCH 13/18] Patched Security Hole --- admin.php | 2 ++ index.php | 1 + 2 files changed, 3 insertions(+) diff --git a/admin.php b/admin.php index bb2b792..e4977a4 100644 --- a/admin.php +++ b/admin.php @@ -170,8 +170,10 @@ function setLanguage(lang) { if (isset($user) && $user->getOpenSession()){ header('Location: index.php?service=admin.php&invalid'); + exit; //PREVENT SECURITY HOLE }else{ header('Location: index.php?service=admin.php&admin'); + exit; //PREVENT SECURITY HOLE } } diff --git a/index.php b/index.php index f2f6323..1287a63 100644 --- a/index.php +++ b/index.php @@ -94,6 +94,7 @@ //login succeeded, perform redirect header('Location: ' . $service) ; + exit; //PREVENT SECURITY HOLE } } From 0d71fdbe35b4f7ceecf0acb7b74d6db3713a1fc1 Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Mon, 13 Jun 2016 07:58:57 -0600 Subject: [PATCH 14/18] Fixed Language Code -- changed all references to look at 5 characters, not 2 --- admin.php | 14 +++++++------- index.php | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/admin.php b/admin.php index e4977a4..d1b6454 100644 --- a/admin.php +++ b/admin.php @@ -49,7 +49,7 @@ getLanguage($str); if($default_l==null || empty($default_l)){$default_l=$str;} if(isset($_COOKIE["lang"])){ @@ -106,22 +106,22 @@ echo "
"._("Invalid translation route!"); } // Get language of navigator - $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2); + $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5); // Show an ordered list sort($lang); for($i=0; $i".$lang_name->getNameLang(substr($lang[$i],0,2)).""; + echo ""; }else{ - echo ""; + echo ""; } }else{ - if($defLang==substr($lang[$i],0,2)){ - echo ""; + if($defLang==substr($lang[$i],0,5)){ + echo ""; }else{ - echo ""; + echo ""; } } } diff --git a/index.php b/index.php index 1287a63..6c9045b 100644 --- a/index.php +++ b/index.php @@ -178,7 +178,7 @@ getLanguage($str); if($default_l==null || empty($default_l)){$default_l=$str;} if(isset($_COOKIE["lang"])){ @@ -234,7 +234,7 @@ echo "
"._("Invalid translation route!"); } // Get language of navigator - $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2); + $defLang = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,5); // Show an ordered list sort($lang); @@ -246,7 +246,7 @@ echo ""; } }else{ - if($defLang==substr($lang[$i],0,2)){ + if($defLang==substr($lang[$i],0,5)){ echo ""; }else{ echo ""; From 2379e77dbe07487b99db7377faabe179aa1c59aa Mon Sep 17 00:00:00 2001 From: Ryan Chisum Date: Mon, 13 Jun 2016 12:10:51 -0600 Subject: [PATCH 15/18] Changed Title Bar to Be Translatable --- .DS_Store | Bin 10244 -> 0 bytes .gitignore | 1 + admin.php | 9 ++++++--- css/style.css | 29 +++++++++++++++++++++++++++++ images/authtitle.gif | Bin 4928 -> 3428 bytes index.php | 36 ++++++++++++++++++++++-------------- 6 files changed, 58 insertions(+), 17 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 7df5008615bb9b06f5038e226cc3e3895e97ffd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMU2GIp6h3EL+PP3;{aIR&I=eHpgR?X1&TO~X z5No2*2Q~fx!iy1JOo%2vh>5-!A2do#^Z^ry`eKZUPbTUEZ+Py#vt@U>eegvMnY)>L z?mhRM`}55=d-lu%0CpGk4uCiSD0FeDHc?fh@Ns_4DG^`ON)pK*4p>e$V>ub>t8=VF zMTkI%K!`wyK!`wy!2baOirKsiTv)av+i|eLfdUu-pKk&_jC>}* z0}ZnDF~9}4+5?XUJQk3x4mn!G4p`m{ShBm8v`U`V$ya+sP6j;gBahQ`O~DwP68q25 zj%xe<67X%V@Z~4Ufkpe&#Mx@j035%I75FW!m?2NtIb}rnSqahFvv5Q!XK92UI0F4J z0tes;=&L@lK(o@ij@FoqIY+XFRi@sa&nDv29qrq;C*nIhx1Bw! zC@b4K_a02!({G(Sf8p(mmp-C%Qb9jxK(p-6*4L=zBV@Ug{qpP)XYSeAqG+nMci)(* z7G2}0VQHQ@X{0pIpv^9E36KL>$M!d!&N@~xXVXY?Ro-Wi6~VJ;_nA zjG>aLdlMs?n>B3Rw8uy3PS~D#$}|eB8E>;eTgw^JYejS=Q?Dr}blT2gN9Q)W7>TZk zu2z)eT;EeLsFrFLkFI5^rVP5YH95t4*2Ywq4L(gbOS*1k2}RY}kfmh|OR64W9g2F8 zr6=Y7rE)9Vt~6tU9m_ho9PQAR>Rr*@iu#pulCOP8bG;*Z!=~jQ+p|}tU3JfQN<|sr z9$mU_=*qg}26;c%CEH~~CBREPAfDI*h1zv^M;1XPctMDOw3SYpN@HJeA zZ{a4~f*;^V_znJmKjAL~WVjHUa51*vD!d=p-~;#|Zo|L@S|>*ZFLkCakfX#%&SkY;j_zW_#Dh$2 zkfVE8QanE@$o~3RiYY4AAltlDyG%s;glKjhzJu@KC-@nDhucK122^o5uD}?PYc)QE zZTK*5!~|}`?YI+n;clWjXGkSLZWl4Xcw2A;wRdgU{m&_#(bU zlzRi;#B+Ea-wBXyf0<@d;(K?=HaSqREyo@w4X5T}ie@H{==8vNA~v3>9g##-t&AQG zt^HqPUFbv%mjC|YUDM6A=va;o<1JZhp+5j7iyhb!W&1y=R^K+#eB^v64QXeFMI zoDS}R$Hb}`8{jDPLKmdqF!WZ>hZGsBY{jHu6(SHK5F!vF5F&67Ay6mJ66f##d*}cE z{~kJVc$5%<5P={9Sf3h5b(6N7p#}~3yY@I;PtnB-x0{htxKJft$CDJVS{xecii^{+MXF!<$|HGG1Vg7%Q<^O*JAkrq_ diff --git a/.gitignore b/.gitignore index 5f0a515..528428c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ admin/configuration.ini +.DS_Store diff --git a/admin.php b/admin.php index d1b6454..aeefc03 100644 --- a/admin.php +++ b/admin.php @@ -42,6 +42,7 @@ + @@ -69,9 +70,11 @@
- -
-
+
+
+
+
+
diff --git a/css/style.css b/css/style.css index 4a55304..2960f42 100644 --- a/css/style.css +++ b/css/style.css @@ -418,3 +418,32 @@ p.fontText { .boxRight select#lang { float: none; } + +/*--- Allow Browser to Scroll When Modal Appears ---*/ + +#TB_window { + position: absolute !important; + margin-top: 100px !important; + top: 0 !important; +} + +/*--- Modify Login/Admin Title to Allow for Changes to Language ---*/ + +#title-div { + background: #306d9c; + width: 418px; + color: #fff; + font-family: "Open Sans", sans-serif; + font-weight: 100; + padding: 20px 0; + font-size: 24px; +} + +#img-title { + margin-bottom: 5px; +} + +#login-content { + border: solid 1px #306d9c; + padding: 20px; +} diff --git a/images/authtitle.gif b/images/authtitle.gif index 9a9b15ca63328907abd59d16caa5fb1f00335a7b..5cdd84f6fe3163a69c7e95f4c56d96f57b793a9b 100644 GIT binary patch delta 1809 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 + @@ -198,20 +199,27 @@
- -
-
- - -
- - -
- - /> - -
- +
+
+
+
+
+
+ +
+
+ + +
+ + +
+ + /> + +
+ +
From 3e8f45235b1457a88a0ff3cb9ff36f3b4cb47b9d Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Mon, 13 Jun 2016 13:11:00 -0600 Subject: [PATCH 16/18] Updated French Language --- locale/fr_FR/LC_MESSAGES/messages.mo | Bin 5207 -> 5101 bytes locale/fr_FR/LC_MESSAGES/messages.po | 107 ++++++++++++++------------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index bec110a70e34a0618db3a9751ddbabf72bd00aa8..f808bbff1fc5a0d7317821db851eba0a29ce1878 100644 GIT binary patch delta 1335 zcmX}sOGs2v9LMo9Iy2d*qod=iDVv;XoXL6l7|j+X5n1787C|pi!$<;cF+mVHt*hOo zRhyJnt&G_uL`0B;gp>+Wgjf)>8d}&!+VuThuO2*p&N-fY9{>OKu6LHBg^dRHGeha8 z9;B|hjJbeMEBQs4cNqG+2mFbLu!KqUu&XZCi^uQ^ zrm=t__BZo16yndQP<}%#xQSY5%NY-Fy$brRsCgmB4#yZW)ueHOG!CMl{@?1I)K#*H z)~iOPB!&epX-?BnD9_^{&Y*6*fbF=9C$Nk5xC0phRRtTCVsw^0vxiGLbXIE1698_wY++(2y<=kyBcSyUv)P?4L& zUYtReG(}YEKBDG*LZ#|U!5R3Dq|5w5QfC*1UT?B)rjpsgj*uQ!VY>aYYEhLAs#2xs zC;~cU8&&B_QdPRCeN=qf+Lj zhNy~eipslaVpK(mh;-W@ogO+-s&b+z5MASZf9#KjK2CZMRGNxk-IXruho`;h^0v4G zxsmYDz5MNosr=;4vHaxpl-2BeP@hetvx!VkIMXwjPSdt#eIei8NWZn{D^(?vDf`EI mUp-zNt(kUN>$NAXNPR=G%m3CB++FpSvu=1IH)53<@BRm#^ncp` delta 1435 zcmZwHNla5g9LMotDGG>!xF84?Q9!h`RLW8?gdjwNMg*ef(PkI6Av0q z)r7=@a#0fF1(&mUP)`~!xJ5mQ(da?FxE%cc9uH4WGX2c7^ZqmQpLzXKGE*9RyEOT- zq0~@UQ{N;QvkR{#@j-c!Y|J8ji3{+9)BlQT^nYUtrnrn*hZ&B3%%r~$mtzPEaSTiF z8m1Z(GmmK~@N-;)uTTMhp#mn*k;Ryct@s>|B123q4==<9tio+bU=u?v@GP=Ma|tzW z9GBq)rZT^|Ph$mNJU}$u4n1lIP zfaO?^+R$-a&-~^B4IkdaJe)T~J1r&+1z3k0u@kl6Gq@7(qXIug-J==Q0y3Gk z4s%g)_hK=g!|!-!G5Kc>b90F?S$G!@;3Le&BJ!^9tC6gl?WpnXsJn6)iDhD_z~^y2 z-o<8ojXJVIg5+QgYTRxt#nCMC-$~;-U-C3tk4jn4>2F1j&FnzlNc&->o~}J!L74kr zDR)}BFWNu})k9U5lo3Cbx$O(B*IdV@60=t^*S2q~R$b=w-AD%Q9Xo#q_AeEDYL{#6 z-dtt^v{yNOq0Q)MRFuj2qD|>2Rk%}1zA@=k{W<78-Aq-{Ic>08oIh@&axLtlOFLim z#^`eCoOSv13hKzr)MRo}f~z+Y9t_1NU4dDN2#~1Ka1l$#s z!OGf=zKZy%w7j%RkFUz@s}2Tg;}dDK+1?XY)H^aV;%(}WS`n``JQRvwOh2+^zo)Ig zr#n34>FBYdU7DAYXK6&ddC>Gt@7?*BaIJvQhahz$3J`v#}Jr4J-5Xzc5aSmD9A Yl@VOn61Dms-mt<`;~CFf@v-dwzmAocX8-^I diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index 2c118ed..9081847 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" -"POT-Creation-Date: 2015-05-15 14:49+0100\n" -"PO-Revision-Date: 2016-04-05 16:29+0100\n" +"POT-Creation-Date: 2016-06-13 13:00-0600\n" +"PO-Revision-Date: 2016-06-13 13:07-0600\n" "Last-Translator: Paul Poulain \n" "Language-Team: \n" "Language: fr_FR\n" @@ -10,21 +10,32 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.7\n" -"X-Poedit-Basepath: /var/www/Coral/auth\n" +"X-Poedit-Basepath: ../../..\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SearchPath-0: .\n" -"X-Poedit-SearchPathExcluded-0: /var/www/Coral/auth/js/plugins\n" -#: LangCodes.php:16 -msgid "French" -msgstr "Français" +#: js/admin.js:67 +msgid "Passwords do not match" +msgstr "Les mots de passe ne correspondent pas" + +#: js/admin.js:73 +msgid "Password is required" +msgstr "Le mot de passe est obligatoire" -#: LangCodes.php:17 -msgid "English" -msgstr "Anglais" +#: js/admin.js:78 +msgid "UserID is required" +msgstr "Le nom d'utilisateur est obligatoire" -#: admin.php:66 index.php:192 +#: js/admin.js:89 +msgid "Do you really want to delete this user?" +msgstr "Voulez-vous vraiment supprimer cet utilisateur ?" + +#: js/index.js:40 +msgid "Refreshing Contents..." +msgstr "Actualisation des contenus en cours..." + +#: admin.php:66 index.php:195 msgid "" "JavaScript must be enabled in order for you to use CORAL. However, it seems " "JavaScript is either disabled or not supported by your browser. To use " @@ -35,33 +46,37 @@ msgstr "" "Pour utiliser CORAL, activez JavaScript en modifiant les options de votre " "navigateur, puis" -#: admin.php:66 index.php:192 +#: admin.php:66 index.php:195 msgid "try again" msgstr "réessayez" -#: admin.php:80 +#: admin.php:75 index.php:205 +msgid "eRM Authentication" +msgstr "Authentification eRM" + +#: admin.php:82 msgid "Users" msgstr "Utilisateurs" -#: admin.php:81 +#: admin.php:83 msgid "Login ID must match the login ID set up in the modules" msgstr "" -"Le nom d'utilisateur doit être identique au nom d'utilisateur paramétré " -"dans les modules" +"Le nom d'utilisateur doit être identique au nom d'utilisateur paramétré dans " +"les modules" -#: admin.php:87 +#: admin.php:89 msgid "Processing..." msgstr "Traitement en cours..." -#: admin.php:91 index.php:217 +#: admin.php:93 index.php:226 msgid "Change language:" msgstr "Modifier la langue :" -#: admin.php:107 index.php:233 +#: admin.php:109 index.php:242 msgid "Invalid translation route!" msgstr "Chemin vers les traductions invalide !" -#: admin.php:132 +#: admin.php:134 msgid "Login page" msgstr "Page de connexion" @@ -169,86 +184,72 @@ msgstr "Nom d'utilisateur invalide. Veuillez réessayer à nouveau." msgid "Invalid password. Please try again." msgstr "Mot de passe invalide. Veuillez réessayer à nouveau." -#: index.php:107 +#: index.php:108 msgid "You are already logged in as " msgstr "Vous êtes déjà connecté en tant que " -#: index.php:107 +#: index.php:108 msgid "You may log in as another user below," msgstr "Vous pouvez vous connecter sous un autre compte ci-dessous," -#: index.php:107 +#: index.php:108 msgid "return" msgstr "Retourner" -#: index.php:107 +#: index.php:108 msgid "or" msgstr "ou" -#: index.php:107 +#: index.php:108 msgid "logout" msgstr "Déconnectez-vous" -#: index.php:128 +#: index.php:129 msgid "Please enter login credentials to sign in." msgstr "Merci d'entrer vos identifiants de connexion pour ouvrir une session." -#: index.php:136 +#: index.php:137 msgid "Your session has timed out." msgstr "Votre session a expiré." -#: index.php:145 +#: index.php:146 msgid "You do not have permission to enter." msgstr "Vous n'avez pas les autorisations requises pour accéder au site." -#: index.php:145 +#: index.php:146 msgid "Please contact an administrator." msgstr "Merci de contacter un administrateur." -#: index.php:155 +#: index.php:156 msgid "You must log in before accessing the admin page." msgstr "" "Vous devez vous identifier avant d'accéder à cette page d'administration." -#: index.php:202 +#: index.php:211 msgid "Login ID:" msgstr "Nom d'utilisateur :" -#: index.php:205 +#: index.php:214 msgid "Password:" msgstr "Mot de passe :" -#: index.php:209 +#: index.php:218 msgid "Remember my login ID" msgstr "Mémoriser mes identifiants de connexion" -#: index.php:213 +#: index.php:221 msgid "Login" msgstr "Se connecter" -#: index.php:258 +#: index.php:267 msgid "Admin page" msgstr "Page d'administration" -#: js/admin.js:67 -msgid "Passwords do not match" -msgstr "Les mots de passe ne correspondent pas" - -#: js/admin.js:73 -msgid "Password is required" -msgstr "Le mot de passe est obligatoire" - -#: js/admin.js:78 -msgid "UserID is required" -msgstr "Le nom d'utilisateur est obligatoire" +#~ msgid "French" +#~ msgstr "Français" -#: js/admin.js:89 -msgid "Do you really want to delete this user?" -msgstr "Voulez-vous vraiment supprimer cet utilisateur ?" - -#: js/index.js:40 -msgid "Refreshing Contents..." -msgstr "Actualisation des contenus en cours..." +#~ msgid "English" +#~ msgstr "Anglais" #~ msgid "Spanish" #~ msgstr "Espagnol" From d161f3b2bc305b42712143325c39888055e70392 Mon Sep 17 00:00:00 2001 From: Ryan Chisum Date: Mon, 13 Jun 2016 13:24:59 -0600 Subject: [PATCH 17/18] New Image for Title Bar --- images/authtitle.png | Bin 0 -> 5131 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/authtitle.png diff --git a/images/authtitle.png b/images/authtitle.png new file mode 100644 index 0000000000000000000000000000000000000000..29b69c6418d3fbd8d0269549537953b8686841c7 GIT binary patch literal 5131 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 T5~t>V{hmV_nCm~%bq)Uy<^(6> literal 0 HcmV?d00001 From f60d951627e4394aa08c1f606d12eeebec0426af Mon Sep 17 00:00:00 2001 From: Bradley Droubay Date: Thu, 16 Jun 2016 06:41:01 -0600 Subject: [PATCH 18/18] Fix for locales missing in LangCodes.php arrays --- LangCodes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LangCodes.php b/LangCodes.php index 37b743c..8a2542f 100644 --- a/LangCodes.php +++ b/LangCodes.php @@ -12,7 +12,7 @@ public function getLanguage($code){ //'zh_TW'=>'zh_TW', //'de_DE'=>'de_DE' ); - return $all_lang[$code]; + return array_key_exists($code, $all_lang) ? $all_lang[$code] : "en_US"; } public function getNameLang($code_lang){ $name_lang=array( @@ -22,7 +22,7 @@ public function getNameLang($code_lang){ //'zh_TW'=>'中文 (台灣)', //'de_DE'=>'Deutsch' ); - return $name_lang[$code_lang]; + return array_key_exists($code_lang, $name_lang) ? $name_lang[$code_lang] : "English"; } } ?> \ No newline at end of file