From 9338af0d3151809b6224ffd18e4776a2f5a946d5 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 12 Dec 2013 09:58:05 +0100 Subject: [PATCH 01/15] [ADDED] Terms and Conditions page --- public/include/pages/tac.inc.php | 6 ++++++ public/templates/mpos/tac/default.tpl | 15 +++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 public/include/pages/tac.inc.php create mode 100644 public/templates/mpos/tac/default.tpl diff --git a/public/include/pages/tac.inc.php b/public/include/pages/tac.inc.php new file mode 100644 index 00000000..de4542b1 --- /dev/null +++ b/public/include/pages/tac.inc.php @@ -0,0 +1,6 @@ +assign("CONTENT", "default.tpl"); +?> diff --git a/public/templates/mpos/tac/default.tpl b/public/templates/mpos/tac/default.tpl new file mode 100644 index 00000000..7e07e9a6 --- /dev/null +++ b/public/templates/mpos/tac/default.tpl @@ -0,0 +1,15 @@ +
+

Terms & Conditions

+
+

This Agreement governs your use of {$GLOBAL.website.name}.

+
    +
  1. By using any of the Pools or registering an account on the website, you agree to be bound by the terms and conditions below. If you do not agree with the terms and conditions in this Agreement you may not use the Pool.
    2. +
  2. The {$GLOBAL.website.name} staff may modify this Agreement and any policies affecting the Site at any point of time. Such modification is effective immediately upon posting to the website and will be distribution via email, forum post and a link in chat. Your continued use of the Pool following any modification to this Agreement shall be deemed an acceptance of all modifications.
    3. +
  3. The Pool rewards miners according to a {$GLOBAL.config.payout_system} system with {$GLOBAL.fees}% fee. The fee may change at any time, but notice will be given before doing so. Any fee change will be communicated through the pools news page.
    4. +
  4. The Pool is not an e-wallet or a bank for your coins. The Pool and it's operators are not responsible for any loss of coins which are stored on the Pool. It is your responsibility to configure your account so that the coins you mine are regularly transferred to your own secured offline wallet.
    5. +
  5. The uptime of the pool or website is not guaranteed, maintenance and downtime may be required at times. Users are responsible for configuring their miners so that they will automatically reconnect, switch to all the pools we offer or a backup pool in the case of downtime.
    6. +
  6. Botnets are not welcome. Accounts with a large amount of miners connecting from different IPs may be suspended without prior notice. If we are uncertian then an investigation will be opened and the user will be notified via their configured e-mail address. If we do not receive a response your account may be suspended.
    7. +
  7. Multiple accounts controlled by one person may be considered as a botnet and a investigation will be opened, see 6.
    8. +
+
+
From f465bda3501e519bb0892f1e38cb07c2d6695ff1 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 12 Dec 2013 10:11:44 +0100 Subject: [PATCH 02/15] [ADDED] Accept TaC during registration --- public/include/classes/user.class.php | 6 +- .../include/pages/register/register.inc.php | 4 +- public/templates/mpos/register/default.tpl | 57 ++++++++++--------- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php index 16502af2..fa1d5485 100644 --- a/public/include/classes/user.class.php +++ b/public/include/classes/user.class.php @@ -456,8 +456,12 @@ class User extends Base { * @param email2 string Email confirmation * @return bool **/ - public function register($username, $password1, $password2, $pin, $email1='', $email2='', $strToken='') { + public function register($username, $password1, $password2, $pin, $email1='', $email2='', $tac='', $strToken='') { $this->debug->append("STA " . __METHOD__, 4); + if ($tac != 1) { + $this->setErrorMessage('You need to accept our Terms and Conditions'); + return false; + } if (strlen($username) > 40) { $this->setErrorMessage('Username exceeding character limit'); return false; diff --git a/public/include/pages/register/register.inc.php b/public/include/pages/register/register.inc.php index 3c63963b..79856585 100644 --- a/public/include/pages/register/register.inc.php +++ b/public/include/pages/register/register.inc.php @@ -23,7 +23,7 @@ if ($setting->getValue('disable_invitations') && $setting->getValue('lock_regist if ($rsp->is_valid) { $smarty->assign("RECAPTCHA", recaptcha_get_html($setting->getValue('recaptcha_public_key'))); isset($_POST['token']) ? $token = $_POST['token'] : $token = ''; - if ($user->register(@$_POST['username'], @$_POST['password1'], @$_POST['password2'], @$_POST['pin'], @$_POST['email1'], @$_POST['email2'], $token)) { + if ($user->register(@$_POST['username'], @$_POST['password1'], @$_POST['password2'], @$_POST['pin'], @$_POST['email1'], @$_POST['email2'], @$_POST['tac'], $token)) { ! $setting->getValue('accounts_confirm_email_disabled') ? $_SESSION['POPUP'][] = array('CONTENT' => 'Please check your mailbox to activate this account') : $_SESSION['POPUP'][] = array('CONTENT' => 'Account created, please login'); } else { $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to create account: ' . $user->getError(), 'TYPE' => 'errormsg'); @@ -39,7 +39,7 @@ if ($setting->getValue('disable_invitations') && $setting->getValue('lock_regist // Captcha disabled } else { isset($_POST['token']) ? $token = $_POST['token'] : $token = ''; - if ($user->register(@$_POST['username'], @$_POST['password1'], @$_POST['password2'], @$_POST['pin'], @$_POST['email1'], @$_POST['email2'], $token)) { + if ($user->register(@$_POST['username'], @$_POST['password1'], @$_POST['password2'], @$_POST['pin'], @$_POST['email1'], @$_POST['email2'], @$_POST['tac'], $token)) { ! $setting->getValue('accounts_confirm_email_disabled') ? $_SESSION['POPUP'][] = array('CONTENT' => 'Please check your mailbox to activate this account') : $_SESSION['POPUP'][] = array('CONTENT' => 'Account created, please login'); } else { $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to create account: ' . $user->getError(), 'TYPE' => 'errormsg'); diff --git a/public/templates/mpos/register/default.tpl b/public/templates/mpos/register/default.tpl index ba8f58e6..f109d8e9 100644 --- a/public/templates/mpos/register/default.tpl +++ b/public/templates/mpos/register/default.tpl @@ -1,38 +1,43 @@

Register new account

-
- + + {if $smarty.request.token|default:""} - § + § {/if} - -
- - -
-
- - - - -
-
- - - - -
-
- - (4 digit number. Remember this pin!) -
- {nocache}{$RECAPTCHA|default:""}{/nocache} + +
+ + +
+
+ + + + +
+
+ + + + +
+
+ + (4 digit number. Remember this pin!) +
+ {nocache}{$RECAPTCHA|default:""}{/nocache} +
+  Accept Terms and Conditions + + +
+
-
From d0a29747a289447829ee74be996aac09e6c64d2d Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 12 Dec 2013 10:14:49 +0100 Subject: [PATCH 03/15] [ADDED] TaC link to Navigation This, and other, commit will address #965 --- public/templates/mpos/global/navigation.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/public/templates/mpos/global/navigation.tpl b/public/templates/mpos/global/navigation.tpl index 13be7f83..e3267b0c 100644 --- a/public/templates/mpos/global/navigation.tpl +++ b/public/templates/mpos/global/navigation.tpl @@ -79,6 +79,7 @@
  • Sign Up
  • Support
    • +
  • Terms and Conditions
    • {/if}
      From 64494672d8254c79e96b5361dd73d462b026a074 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 20:51:35 +1100 Subject: [PATCH 04/15] Create tinybox.js TinyBox PopUp JS --- public/site_assets/mpos/js/tinybox.js | 134 ++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 public/site_assets/mpos/js/tinybox.js diff --git a/public/site_assets/mpos/js/tinybox.js b/public/site_assets/mpos/js/tinybox.js new file mode 100644 index 00000000..f5e10670 --- /dev/null +++ b/public/site_assets/mpos/js/tinybox.js @@ -0,0 +1,134 @@ +TINY={}; + +TINY.box=function(){ + var j,m,b,g,v,p=0; + return{ + show:function(o){ + v={opacity:70,close:1,animate:1,fixed:1,mask:1,maskid:'',boxid:'',topsplit:2,url:0,post:0,height:0,width:0,html:0,iframe:0}; + for(s in o){v[s]=o[s]} + if(!p){ + j=document.createElement('div'); j.className='tbox'; + p=document.createElement('div'); p.className='tinner'; + b=document.createElement('div'); b.className='tcontent'; + m=document.createElement('div'); m.className='tmask'; + g=document.createElement('div'); g.className='tclose'; g.v=0; + document.body.appendChild(m); document.body.appendChild(j); j.appendChild(p); p.appendChild(b); + m.onclick=g.onclick=TINY.box.hide; window.onresize=TINY.box.resize + }else{ + j.style.display='none'; clearTimeout(p.ah); if(g.v){p.removeChild(g); g.v=0} + } + p.id=v.boxid; m.id=v.maskid; j.style.position=v.fixed?'fixed':'absolute'; + if(v.html&&!v.animate){ + p.style.backgroundImage='none'; b.innerHTML=v.html; b.style.display=''; + p.style.width=v.width?v.width+'px':'auto'; p.style.height=v.height?v.height+'px':'auto' + }else{ + b.style.display='none'; + if(!v.animate&&v.width&&v.height){ + p.style.width=v.width+'px'; p.style.height=v.height+'px' + }else{ + p.style.width=p.style.height='100px' + } + } + if(v.mask){this.mask(); this.alpha(m,1,v.opacity)}else{this.alpha(j,1,100)} + if(v.autohide){p.ah=setTimeout(TINY.box.hide,1000*v.autohide)}else{document.onkeyup=TINY.box.esc} + }, + fill:function(c,u,k,a,w,h){ + if(u){ + if(v.image){ + var i=new Image(); i.onload=function(){w=w||i.width; h=h||i.height; TINY.box.psh(i,a,w,h)}; i.src=v.image + }else if(v.iframe){ + this.psh('',a,w,h) + }else{ + var x=window.XMLHttpRequest?new XMLHttpRequest():new ActiveXObject('Microsoft.XMLHTTP'); + x.onreadystatechange=function(){ + if(x.readyState==4&&x.status==200){p.style.backgroundImage=''; TINY.box.psh(x.responseText,a,w,h)} + }; + if(k){ + x.open('POST',c,true); x.setRequestHeader('Content-type','application/x-www-form-urlencoded'); x.send(k) + }else{ + x.open('GET',c,true); x.send(null) + } + } + }else{ + this.psh(c,a,w,h) + } + }, + psh:function(c,a,w,h){ + if(typeof c=='object'){b.appendChild(c)}else{b.innerHTML=c} + var x=p.style.width, y=p.style.height; + if(!w||!h){ + p.style.width=w?w+'px':''; p.style.height=h?h+'px':''; b.style.display=''; + if(!h){h=parseInt(b.offsetHeight)} + if(!w){w=parseInt(b.offsetWidth)} + b.style.display='none' + } + p.style.width=x; p.style.height=y; + this.size(w,h,a) + }, + esc:function(e){e=e||window.event; if(e.keyCode==27){TINY.box.hide()}}, + hide:function(){TINY.box.alpha(j,-1,0,3); document.onkeypress=null; if(v.closejs){v.closejs()}}, + resize:function(){TINY.box.pos(); TINY.box.mask()}, + mask:function(){m.style.height=this.total(1)+'px'; m.style.width=this.total(0)+'px'}, + pos:function(){ + var t; + if(typeof v.top!='undefined'){t=v.top}else{t=(this.height()/v.topsplit)-(j.offsetHeight/2); t=t<20?20:t} + if(!v.fixed&&!v.top){t+=this.top()} + j.style.top=t+'px'; + j.style.left=typeof v.left!='undefined'?v.left+'px':(this.width()/2)-(j.offsetWidth/2)+'px' + }, + alpha:function(e,d,a){ + clearInterval(e.ai); + if(d){e.style.opacity=0; e.style.filter='alpha(opacity=0)'; e.style.display='block'; TINY.box.pos()} + e.ai=setInterval(function(){TINY.box.ta(e,a,d)},20) + }, + ta:function(e,a,d){ + var o=Math.round(e.style.opacity*100); + if(o==a){ + clearInterval(e.ai); + if(d==-1){ + e.style.display='none'; + e==j?TINY.box.alpha(m,-1,0,2):b.innerHTML=p.style.backgroundImage='' + }else{ + if(e==m){ + this.alpha(j,1,100) + }else{ + j.style.filter=''; + TINY.box.fill(v.html||v.url,v.url||v.iframe||v.image,v.post,v.animate,v.width,v.height) + } + } + }else{ + var n=a-Math.floor(Math.abs(a-o)*.5)*d; + e.style.opacity=n/100; e.style.filter='alpha(opacity='+n+')' + } + }, + size:function(w,h,a){ + if(a){ + clearInterval(p.si); var wd=parseInt(p.style.width)>w?-1:1, hd=parseInt(p.style.height)>h?-1:1; + p.si=setInterval(function(){TINY.box.ts(w,wd,h,hd)},20) + }else{ + p.style.backgroundImage='none'; if(v.close){p.appendChild(g); g.v=1} + p.style.width=w+'px'; p.style.height=h+'px'; b.style.display=''; this.pos(); + if(v.openjs){v.openjs()} + } + }, + ts:function(w,wd,h,hd){ + var cw=parseInt(p.style.width), ch=parseInt(p.style.height); + if(cw==w&&ch==h){ + clearInterval(p.si); p.style.backgroundImage='none'; b.style.display='block'; if(v.close){p.appendChild(g); g.v=1} + if(v.openjs){v.openjs()} + }else{ + if(cw!=w){p.style.width=(w-Math.floor(Math.abs(w-cw)*.6)*wd)+'px'} + if(ch!=h){p.style.height=(h-Math.floor(Math.abs(h-ch)*.6)*hd)+'px'} + this.pos() + } + }, + top:function(){return document.documentElement.scrollTop||document.body.scrollTop}, + width:function(){return self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth}, + height:function(){return self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight}, + total:function(d){ + var b=document.body, e=document.documentElement; + return d?Math.max(Math.max(b.scrollHeight,e.scrollHeight),Math.max(b.clientHeight,e.clientHeight)): + Math.max(Math.max(b.scrollWidth,e.scrollWidth),Math.max(b.clientWidth,e.clientWidth)) + } + } +}(); From 4d06f36590fd651a6e0aebe912d0a73ba4f0abee Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 20:57:38 +1100 Subject: [PATCH 05/15] Update custom.css Add PopUp CSS --- public/site_assets/mpos/css/custom.css | 51 +++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/public/site_assets/mpos/css/custom.css b/public/site_assets/mpos/css/custom.css index aa1ed6b0..eadbe7ac 100644 --- a/public/site_assets/mpos/css/custom.css +++ b/public/site_assets/mpos/css/custom.css @@ -249,7 +249,56 @@ footer.footer { footer.footer p { color:grey; margin: 0px 0 0 0; - } +} + .DebuggerConsole { z-index:500;position:absolute;display:none } + + +.tbox { + position:absolute; + display:none; + padding:14px 17px; + z-index:900 +} + +.tinner { + padding:0px 30px 0px 0px; + -moz-border-radius:5px; + border-radius:5px; + background:#fff 50% 50%; + border-right:1px solid #333; + border-bottom:1px solid #333 +} + +.tmask { + position:absolute; + display:none; top:0px; + left:0px; height:100%; + width:100%; + background:#000; + z-index:800 +} + +.tclose { + position:absolute; + top:0px; + right:0px; + width:30px; + height:30px; + cursor:pointer; + background:url(../images/close.png) no-repeat +} + +.tclose:hover { + background-position:0 -30px +} + +#frameless { + padding:0 +} + +#frameless .tclose { + left:6px +} From e0c066d656a3958e31048021b8db14a9fc9fe7a7 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 20:59:26 +1100 Subject: [PATCH 06/15] Create tacpop.inc.php --- public/include/pages/tacpop.inc.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 public/include/pages/tacpop.inc.php diff --git a/public/include/pages/tacpop.inc.php b/public/include/pages/tacpop.inc.php new file mode 100644 index 00000000..8d998395 --- /dev/null +++ b/public/include/pages/tacpop.inc.php @@ -0,0 +1,8 @@ +display('default.tpl'); +$supress_master = 1; +?> From 147f7bfc21c65c846bd5670c880052e8c9bdcbe0 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 21:02:17 +1100 Subject: [PATCH 07/15] Update master.tpl Add tinybox.js --- public/templates/mpos/master.tpl | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/public/templates/mpos/master.tpl b/public/templates/mpos/master.tpl index dbf87e0b..ccd47eb9 100644 --- a/public/templates/mpos/master.tpl +++ b/public/templates/mpos/master.tpl @@ -5,9 +5,9 @@ {$GLOBAL.website.title} I {$smarty.request.page|escape|default:"home"|capitalize} - - - + + + @@ -15,18 +15,19 @@ - - + + - - - - + + + + - - + + - + + {if $GLOBAL.statistics.analytics.enabled} {$GLOBAL.statistics.analytics.code} From 66a99cd0863cee3db2c3e4972936ce0ae2015924 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 21:07:10 +1100 Subject: [PATCH 08/15] Create default.tpl Add TacPop default.tpl --- public/templates/mpos/tacpop/default.tpl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 public/templates/mpos/tacpop/default.tpl diff --git a/public/templates/mpos/tacpop/default.tpl b/public/templates/mpos/tacpop/default.tpl new file mode 100644 index 00000000..7e07e9a6 --- /dev/null +++ b/public/templates/mpos/tacpop/default.tpl @@ -0,0 +1,15 @@ +
      +

      Terms & Conditions

      +
      +

      This Agreement governs your use of {$GLOBAL.website.name}.

      +
        +
      1. By using any of the Pools or registering an account on the website, you agree to be bound by the terms and conditions below. If you do not agree with the terms and conditions in this Agreement you may not use the Pool.
        2. +
      2. The {$GLOBAL.website.name} staff may modify this Agreement and any policies affecting the Site at any point of time. Such modification is effective immediately upon posting to the website and will be distribution via email, forum post and a link in chat. Your continued use of the Pool following any modification to this Agreement shall be deemed an acceptance of all modifications.
        3. +
      3. The Pool rewards miners according to a {$GLOBAL.config.payout_system} system with {$GLOBAL.fees}% fee. The fee may change at any time, but notice will be given before doing so. Any fee change will be communicated through the pools news page.
        4. +
      4. The Pool is not an e-wallet or a bank for your coins. The Pool and it's operators are not responsible for any loss of coins which are stored on the Pool. It is your responsibility to configure your account so that the coins you mine are regularly transferred to your own secured offline wallet.
        5. +
      5. The uptime of the pool or website is not guaranteed, maintenance and downtime may be required at times. Users are responsible for configuring their miners so that they will automatically reconnect, switch to all the pools we offer or a backup pool in the case of downtime.
        6. +
      6. Botnets are not welcome. Accounts with a large amount of miners connecting from different IPs may be suspended without prior notice. If we are uncertian then an investigation will be opened and the user will be notified via their configured e-mail address. If we do not receive a response your account may be suspended.
        7. +
      7. Multiple accounts controlled by one person may be considered as a botnet and a investigation will be opened, see 6.
        8. +
      +
      +
      From 6df340c1ef5b8132aea4d0f0ae0ec9d56e33731a Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 21:11:51 +1100 Subject: [PATCH 09/15] Update default.tpl Add Tac Popup Center Captcha align Tac Image --- public/templates/mpos/register/default.tpl | 70 ++++++++++++---------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/public/templates/mpos/register/default.tpl b/public/templates/mpos/register/default.tpl index f109d8e9..4d52a37a 100644 --- a/public/templates/mpos/register/default.tpl +++ b/public/templates/mpos/register/default.tpl @@ -1,43 +1,51 @@ -
      +

      Register new account

      -
      - + + {if $smarty.request.token|default:""} - § + § {/if} - -
      - - -
      -
      - - - - -
      -
      - - - - -
      -
      - - (4 digit number. Remember this pin!) -
      - {nocache}{$RECAPTCHA|default:""}{/nocache} -
      -  Accept Terms and Conditions - - -
      + +
      + + +
      +
      + + + + +
      +
      + + + + +
      +
      + + (4 digit number. Remember this pin!) +
      +
      +
      + Accept Terms and Conditions + + +
      +
      {nocache}{$RECAPTCHA|default:""}{/nocache}
      +
      + From fc2ffd4868d6915a330e2e40a516d0e9d7530802 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 06:42:34 -0500 Subject: [PATCH 10/15] TAC PopUp window for registrations --- public/include/pages/tacpop.inc.php | 3 +-- public/site_assets/mpos/images/close.png | Bin 0 -> 1419 bytes public/templates/mpos/master.tpl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 public/site_assets/mpos/images/close.png diff --git a/public/include/pages/tacpop.inc.php b/public/include/pages/tacpop.inc.php index 8d998395..2d49a40e 100644 --- a/public/include/pages/tacpop.inc.php +++ b/public/include/pages/tacpop.inc.php @@ -2,7 +2,6 @@ // Make sure we are called from index.php if (!defined('SECURITY')) die('Hacking attempt'); - -$smarty->display('default.tpl'); +$smarty->display('tac/default.tpl'); $supress_master = 1; ?> diff --git a/public/site_assets/mpos/images/close.png b/public/site_assets/mpos/images/close.png new file mode 100644 index 0000000000000000000000000000000000000000..817877318e06ad79e9ab860c9aab0e3696309d19 GIT binary patch literal 1419 zcmV;61$6p}P)WuYu$TncKti1Gj=CTkhs3>XbU|3b&aJ`3g$4*jz=Q;Z#>~cmaUvQ92<;fc zKmoy09=1GNzrSo>#{%#d~ z0G^j5>43#c1RRC$f*rva6bJiDDYkIx5^hA8yjqUdz-uz-I8z;5TXF^ZD4)(h_Zs%U?+2nwlDxmG$J5PEJnTm6esX zJ3BjWwb_Mj-WQ-mq^T0Lt*uQLOu0tKvAVh{?}ZiY!^6X$&@kdBxkG#^UeHGTX@ubM z@o`;HTU(RowY9bHS*_NWFtn(FZ^J=ep~>atC3Cyo5rR8AJ0k$1t--6=#l=Nv z{5+_)xAz?ktzp10PrY)3k|ri5WWj<6Kn+UN-rgSe-R|zLJg%;;zJo^r_oXMmh&b}u zo}QjYm{ToK07e5<%PJ@+co7e~xG_TG0x=;|Ymt`VSZhjIxw*O7coc%4lY!xZ7G?O< zqp`8ExI?ib$dHM1!!(Ae{bG`mk`nXEs7cG)i7b|XoY?F2UU5(vz=X4KiiwCiTA*qt ziv^yMAuGo=H#dExc$imjZEZbJI6+KMI#aE4Rf8867Ruwr#l=HB=zhsj$&7pJ?da&Z zXEvKHsi~>#=;$bvg^2JzlmxUKiQ+N^8?7~5T~<<35*p(^2YPyXenRYji0L{wl-^9U zv$KD$udjbEHc^(*@>(q|_12U!rlzKLJsyu2!#^ku$Qo0Kg@&G{rlt;PZB9!|W5kDt zhhf_3k$SD7qJr6MHpVmD4Ss4Fz)qg|wnefa;NbG|vcI&nwD1j(NO5X#BLo?&xVTuJ z_xJa^rl+SL@yxdjJ`PKZI7f29w`OK$K8NPj%7E{3xfuR9DjLz6!G_OTT3W*FN5ufeUiuMHmr?G`&dz3ed3myF1wqTbuCA_! zIKtmCb%5`K_sO~u#U8)hl%+lx8X8)}rki++J=z2F(s|BTqVMzvVp+S>YZeSN(R zf-_-ai5Q_a;B-2D4u`{oEG>3c8kewG1)CX({8b`u~8RHxt7pwQ3xI!9MlC> zt|g>f6oMNX8X^Fqtvz+OI6prx3l>BGYEYuSzP`kEi)w)aFdAsWxlW+k>U7Uny_W12ligynTTFI~|9Q9gztP_U Z3;@($mW6k*bPE6g002ovPDHLkV1oJ2y+Z&1 literal 0 HcmV?d00001 diff --git a/public/templates/mpos/master.tpl b/public/templates/mpos/master.tpl index ccd47eb9..89ffb5cf 100644 --- a/public/templates/mpos/master.tpl +++ b/public/templates/mpos/master.tpl @@ -17,7 +17,7 @@ - + From ff8f2d94e3f0761406e5aea2e387c616d17e70d4 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 06:58:53 -0500 Subject: [PATCH 11/15] TAC PopUp window for registrations --- public/templates/mpos/tacpop/default.tpl | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 public/templates/mpos/tacpop/default.tpl diff --git a/public/templates/mpos/tacpop/default.tpl b/public/templates/mpos/tacpop/default.tpl deleted file mode 100644 index 7e07e9a6..00000000 --- a/public/templates/mpos/tacpop/default.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
      -

      Terms & Conditions

      -
      -

      This Agreement governs your use of {$GLOBAL.website.name}.

      -
        -
      1. By using any of the Pools or registering an account on the website, you agree to be bound by the terms and conditions below. If you do not agree with the terms and conditions in this Agreement you may not use the Pool.
        2. -
      2. The {$GLOBAL.website.name} staff may modify this Agreement and any policies affecting the Site at any point of time. Such modification is effective immediately upon posting to the website and will be distribution via email, forum post and a link in chat. Your continued use of the Pool following any modification to this Agreement shall be deemed an acceptance of all modifications.
        3. -
      3. The Pool rewards miners according to a {$GLOBAL.config.payout_system} system with {$GLOBAL.fees}% fee. The fee may change at any time, but notice will be given before doing so. Any fee change will be communicated through the pools news page.
        4. -
      4. The Pool is not an e-wallet or a bank for your coins. The Pool and it's operators are not responsible for any loss of coins which are stored on the Pool. It is your responsibility to configure your account so that the coins you mine are regularly transferred to your own secured offline wallet.
        5. -
      5. The uptime of the pool or website is not guaranteed, maintenance and downtime may be required at times. Users are responsible for configuring their miners so that they will automatically reconnect, switch to all the pools we offer or a backup pool in the case of downtime.
        6. -
      6. Botnets are not welcome. Accounts with a large amount of miners connecting from different IPs may be suspended without prior notice. If we are uncertian then an investigation will be opened and the user will be notified via their configured e-mail address. If we do not receive a response your account may be suspended.
        7. -
      7. Multiple accounts controlled by one person may be considered as a botnet and a investigation will be opened, see 6.
        8. -
      -
      -
      From e02df01ed0b7c4c75b3ed61b6263b9cf02f68dc8 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Thu, 19 Dec 2013 23:04:47 +1100 Subject: [PATCH 12/15] Update master.tpl [ADDED] tinybox.js for tac popup, Removed not double type="text/javascript" --- public/templates/mpos/master.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/templates/mpos/master.tpl b/public/templates/mpos/master.tpl index 89ffb5cf..f3783801 100644 --- a/public/templates/mpos/master.tpl +++ b/public/templates/mpos/master.tpl @@ -7,14 +7,14 @@ - + - + @@ -27,7 +27,7 @@ - + {if $GLOBAL.statistics.analytics.enabled} {$GLOBAL.statistics.analytics.code} From 01a23a638ffe4d3b84b4931ccaee963c604a0de4 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Fri, 20 Dec 2013 00:14:25 +1100 Subject: [PATCH 13/15] Update index.php --- public/index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index db94059e..19852fc1 100644 --- a/public/index.php +++ b/public/index.php @@ -30,6 +30,9 @@ define("SECURITY", 1); // Include our configuration (holding defines for the requires) if (!include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load site configuration'); +// Our default template to load, pages can overwrite this later +$master_template = 'master.tpl'; + // Start a session session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']); session_start(); @@ -93,7 +96,7 @@ $smarty->assign('DebuggerInfo', $debug->getDebugInfo()); $smarty->assign('RUNTIME', (microtime(true) - $dStartTime) * 1000); // Display our page -if (!@$supress_master) $smarty->display("master.tpl", $smarty_cache_key); +if (!@$supress_master) $smarty->display($master_template, $smarty_cache_key); // Unset any temporary values here unset($_SESSION['POPUP']); From 61151a50aceb498f2c151a644ab2ce4558faf458 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Fri, 20 Dec 2013 00:15:28 +1100 Subject: [PATCH 14/15] Update tacpop.inc.php --- public/include/pages/tacpop.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/include/pages/tacpop.inc.php b/public/include/pages/tacpop.inc.php index 2d49a40e..86087ec0 100644 --- a/public/include/pages/tacpop.inc.php +++ b/public/include/pages/tacpop.inc.php @@ -2,6 +2,5 @@ // Make sure we are called from index.php if (!defined('SECURITY')) die('Hacking attempt'); -$smarty->display('tac/default.tpl'); -$supress_master = 1; +$master_template = 'tac/default.tpl'; ?> From 8b69ba1216d7c5b94cb01ef2f8e216e29931a3c0 Mon Sep 17 00:00:00 2001 From: nrpatten Date: Fri, 20 Dec 2013 00:28:45 +1100 Subject: [PATCH 15/15] Update layout.css --- public/site_assets/mpos/css/layout.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css index e7b06b9d..2ba5a823 100644 --- a/public/site_assets/mpos/css/layout.css +++ b/public/site_assets/mpos/css/layout.css @@ -28,6 +28,7 @@ text-decoration: none; a:hover { text-decoration: underline; +cursor:pointer }