From b657d41bd63d29f4854aa17d2c79a1463c4ab0e5 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:30:11 +1100 Subject: [PATCH 01/25] [ADD] Chat global --- public/include/smarty_globals.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index 8a011b5d..d2187891 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -124,6 +124,8 @@ $aGlobal['acl']['graphs']['statistics'] = $setting->getValue('acl_graphs_statist $aGlobal['acl']['donors']['page'] = $setting->getValue('acl_donors_page'); $aGlobal['acl']['about']['page'] = $setting->getValue('acl_about_page'); $aGlobal['acl']['contactform'] = $setting->getValue('acl_contactform'); +$aGlobal['acl']['chat']['page'] = $setting->getValue('acl_chat_page'); +$aGlobal['acl']['irc']['chat'] = $setting->getValue('acl_irc_chat'); // We don't want these session infos cached if (@$_SESSION['USERDATA']['id']) { From 305d0e4cc9eb667089ae121ad5f3ac3ea3ad4174 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:32:30 +1100 Subject: [PATCH 02/25] [ADD] Chat settings --- public/include/config/admin_settings.inc.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index 9e41bbd6..be23939a 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -250,6 +250,20 @@ $aSettings['acl'][] = array( 'name' => 'acl_contactform', 'value' => $setting->getValue('acl_contactform'), 'tooltip' => 'Make the contactform private (users only) or public.' ); +$aSettings['acl'][] = array( + 'display' => 'Live Chat Page', 'type' => 'select', + 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), + 'default' => 1, + 'name' => 'acl_chat_page', 'value' => $setting->getValue('acl_chat_page'), + 'tooltip' => 'Make the chat page private (users only) or public.' +); +$aSettings['acl'][] = array( + 'display' => 'IRC Chat Channel', 'type' => 'text', + 'size' => 25, + 'default' => '#', + 'name' => 'acl_irc_chat', 'value' => $setting->getValue('acl_irc_chat'), + 'tooltip' => 'Your IRC support channel name.' +); $aSettings['system'][] = array( 'display' => 'E-mail address for system error notifications', 'type' => 'text', 'size' => 25, From b79bd6ae8e954b0ebb5bbdfbd7591f71eeb8919f Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:33:49 +1100 Subject: [PATCH 03/25] [ADD] Chat --- public/include/pages/about/chat.inc.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 public/include/pages/about/chat.inc.php diff --git a/public/include/pages/about/chat.inc.php b/public/include/pages/about/chat.inc.php new file mode 100644 index 00000000..0605a4c5 --- /dev/null +++ b/public/include/pages/about/chat.inc.php @@ -0,0 +1,18 @@ +getValue('acl_chat_page', 1)) { +case '0': + if ($user->isAuthenticated()) { + $smarty->assign("CONTENT", "default.tpl"); + } + break; +case '1': + $smarty->assign("CONTENT", "default.tpl"); + break; +case '2': + $_SESSION['POPUP'][] = array('CONTENT' => 'Page currently disabled. Please try again later.', 'TYPE' => 'errormsg'); + $smarty->assign("CONTENT", "disabled.tpl"); + break; +} From 2aab514624f427ce1d013e878a48850c688929d6 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:35:27 +1100 Subject: [PATCH 04/25] [ADD] Chat tpl --- public/templates/mpos/about/chat/default.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 public/templates/mpos/about/chat/default.tpl diff --git a/public/templates/mpos/about/chat/default.tpl b/public/templates/mpos/about/chat/default.tpl new file mode 100644 index 00000000..ca9aa7bc --- /dev/null +++ b/public/templates/mpos/about/chat/default.tpl @@ -0,0 +1,9 @@ +

If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$GLOBAL.acl.irc.chat|default:"#"}

+
+

Web Chat

+
+ + +
+
+
From fdd8cb64f9feb801f5850f89f984b3648588efc6 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:36:14 +1100 Subject: [PATCH 05/25] Create disabled.tpl --- public/templates/mpos/about/chat/disabled.tpl | 1 + 1 file changed, 1 insertion(+) create mode 100644 public/templates/mpos/about/chat/disabled.tpl diff --git a/public/templates/mpos/about/chat/disabled.tpl b/public/templates/mpos/about/chat/disabled.tpl new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/public/templates/mpos/about/chat/disabled.tpl @@ -0,0 +1 @@ +0 From a68a5675b189a4222ab2d0b31953a1429c3b7207 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:39:22 +1100 Subject: [PATCH 06/25] [ADD] Chat Link To Nav --- 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 d4666450..9d97235e 100644 --- a/public/templates/mpos/global/navigation.tpl +++ b/public/templates/mpos/global/navigation.tpl @@ -42,6 +42,7 @@
  • Getting Started
    • {acl_check icon='icon-doc' page='about' action='pool' name='About' acl=$GLOBAL.acl.about.page} {acl_check icon='icon-money' page='about' action='donors' name='Donors' acl=$GLOBAL.acl.donors.page} + {acl_check icon='icon-megaphone' page='about' action='chat' name='Web Chat' acl=$GLOBAL.acl.chat.page}

    Other

      From e7ec045785d7f5e08fecec554b3e97c241df3a02 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:42:45 +1100 Subject: [PATCH 07/25] [ADD] Donor --- .../statistics/pool/contributors_shares.tpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/public/templates/mpos/statistics/pool/contributors_shares.tpl b/public/templates/mpos/statistics/pool/contributors_shares.tpl index 5a85e789..d98d9ea4 100644 --- a/public/templates/mpos/statistics/pool/contributors_shares.tpl +++ b/public/templates/mpos/statistics/pool/contributors_shares.tpl @@ -4,9 +4,9 @@ Rank - - User Name - Shares + Donor + User Name + Shares @@ -15,17 +15,17 @@ {section shares $CONTRIBSHARES} {$rank++} - {if $CONTRIBSHARES[shares].donate_percent > 0}{/if} - {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} - {$CONTRIBSHARES[shares].shares|number_format} + {if $CONTRIBSHARES[shares].donate_percent > 0}{else}{/if} + {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} + {$CONTRIBSHARES[shares].shares|number_format} {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0} n/a - {if $GLOBAL.userdata.donate_percent > 0}{/if} - {$GLOBAL.userdata.username|escape} - {$GLOBAL.userdata.shares.valid|number_format} + {if $GLOBAL.userdata.donate_percent > 0}{else}{/if} + {$GLOBAL.userdata.username|escape} + {$GLOBAL.userdata.shares.valid|number_format} {/if} From ac8657e90986f974e191490eb7a1323976d0cae1 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sat, 22 Feb 2014 21:43:57 +1100 Subject: [PATCH 08/25] [ADD] Donor --- .../statistics/pool/contributors_hashrate.tpl | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl index af7926fa..42eba5fd 100644 --- a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl @@ -5,9 +5,9 @@ Rank - - User Name - KH/s + Donor + User Name + KH/s {$GLOBAL.config.currency}/Day {if $GLOBAL.config.price.currency}{$GLOBAL.config.price.currency}/Day{/if} @@ -19,22 +19,22 @@ {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} {$rank++} - {if $CONTRIBHASHES[contrib].donate_percent > 0}{/if} - {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} - {$CONTRIBHASHES[contrib].hashrate|number_format} - {$estday|number_format:"3"} - {if $GLOBAL.config.price.currency}{($estday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} + {if $CONTRIBHASHES[contrib].donate_percent > 0}{else}{/if} + {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} + {$CONTRIBHASHES[contrib].hashrate|number_format} + {$estday|number_format:"3"} + {if $GLOBAL.config.price.currency}{($estday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.rawhashrate|default:"0" > 0} {math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate} n/a - {if $GLOBAL.userdata.donate_percent > 0}{/if} - {$GLOBAL.userdata.username|escape} - {$GLOBAL.userdata.rawhashrate|number_format} - {$myestday|number_format:"3"|default:"n/a"} - {if $GLOBAL.config.price.currency}{($myestday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} + {if $GLOBAL.userdata.donate_percent > 0}{else}{/if} + {$GLOBAL.userdata.username|escape} + {$GLOBAL.userdata.rawhashrate|number_format} + {$myestday|number_format:"3"|default:"n/a"} + {if $GLOBAL.config.price.currency}{($myestday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} {/if} From 0e81af405ac7ead767303a5e7a05eaf19d2aff04 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sun, 23 Feb 2014 07:14:06 +1100 Subject: [PATCH 09/25] [FIX]tablesorter margin on resize Stops the tablesorter from pushing right on window resize --- public/site_assets/mpos/css/layout.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css index 2ff6631a..ceb6ce40 100644 --- a/public/site_assets/mpos/css/layout.css +++ b/public/site_assets/mpos/css/layout.css @@ -449,7 +449,7 @@ margin-bottom: 8px} .tablesorter, .tablesorterpager { width: 100%; -margin: -5px 0 0 0; +margin: -4px 0 0 0; } .tablesorter td, .tablesorterpager td{ From 45127409edfa749b70fa8b6f793ff0779de00c6e Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Sun, 23 Feb 2014 07:26:36 +1100 Subject: [PATCH 10/25] [FIX] Web Chat Disabled bt default --- public/include/config/admin_settings.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index be23939a..aede7b08 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -253,7 +253,7 @@ $aSettings['acl'][] = array( $aSettings['acl'][] = array( 'display' => 'Live Chat Page', 'type' => 'select', 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), - 'default' => 1, + 'default' => 2, 'name' => 'acl_chat_page', 'value' => $setting->getValue('acl_chat_page'), 'tooltip' => 'Make the chat page private (users only) or public.' ); From b1af60709ea3002ee6642a066213dc9b6abcc864 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 19:17:31 +1100 Subject: [PATCH 11/25] [EDIT] move from acl to system Was going to do this the first time.. dunno why i put it in acl :p --- public/include/config/admin_settings.inc.php | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index aede7b08..cafe71a3 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -250,20 +250,6 @@ $aSettings['acl'][] = array( 'name' => 'acl_contactform', 'value' => $setting->getValue('acl_contactform'), 'tooltip' => 'Make the contactform private (users only) or public.' ); -$aSettings['acl'][] = array( - 'display' => 'Live Chat Page', 'type' => 'select', - 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), - 'default' => 2, - 'name' => 'acl_chat_page', 'value' => $setting->getValue('acl_chat_page'), - 'tooltip' => 'Make the chat page private (users only) or public.' -); -$aSettings['acl'][] = array( - 'display' => 'IRC Chat Channel', 'type' => 'text', - 'size' => 25, - 'default' => '#', - 'name' => 'acl_irc_chat', 'value' => $setting->getValue('acl_irc_chat'), - 'tooltip' => 'Your IRC support channel name.' -); $aSettings['system'][] = array( 'display' => 'E-mail address for system error notifications', 'type' => 'text', 'size' => 25, @@ -355,6 +341,20 @@ $aSettings['system'][] = array( 'name' => 'disable_transactionsummary', 'value' => $setting->getValue('disable_transactionsummary'), 'tooltip' => 'Disable transaction summaries. Helpful with large transaction tables.' ); +$aSettings['system'][] = array( + 'display' => 'Live Chat Page', 'type' => 'select', + 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), + 'default' => 2, + 'name' => 'system_chat_page', 'value' => $setting->getValue('system_chat_page'), + 'tooltip' => 'Make the chat page private (users only) or public.' +); +$aSettings['system'][] = array( + 'display' => 'IRC Chat Channel', 'type' => 'text', + 'size' => 25, + 'default' => '#', + 'name' => 'system_irc_chat', 'value' => $setting->getValue('system_irc_chat'), + 'tooltip' => 'Your IRC support channel name.' +); $aSettings['recaptcha'][] = array( 'display' => 'Enable re-Captcha', 'type' => 'select', 'options' => array( 0 => 'No', 1 => 'Yes' ), From 467a9531a60d1004b329c61d47a2afb954fc4ba4 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 19:27:53 +1100 Subject: [PATCH 12/25] Update navigation.tpl --- public/templates/mpos/global/navigation.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mpos/global/navigation.tpl b/public/templates/mpos/global/navigation.tpl index 9d97235e..4f147a1e 100644 --- a/public/templates/mpos/global/navigation.tpl +++ b/public/templates/mpos/global/navigation.tpl @@ -42,7 +42,7 @@
    • Getting Started
      • {acl_check icon='icon-doc' page='about' action='pool' name='About' acl=$GLOBAL.acl.about.page} {acl_check icon='icon-money' page='about' action='donors' name='Donors' acl=$GLOBAL.acl.donors.page} - {acl_check icon='icon-megaphone' page='about' action='chat' name='Web Chat' acl=$GLOBAL.acl.chat.page} + {acl_check icon='icon-megaphone' page='about' action='chat' name='Web Chat' acl=$GLOBAL.system.chat.page}

    Other

      From 9372da9aa889e9a0c0b315083d0fefca92f1c9fe Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 19:28:26 +1100 Subject: [PATCH 13/25] Update default.tpl --- public/templates/mpos/about/chat/default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/mpos/about/chat/default.tpl b/public/templates/mpos/about/chat/default.tpl index ca9aa7bc..753a6ee3 100644 --- a/public/templates/mpos/about/chat/default.tpl +++ b/public/templates/mpos/about/chat/default.tpl @@ -1,9 +1,9 @@ -

      If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$GLOBAL.acl.irc.chat|default:"#"}

      +

      If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$GLOBAL.system.irc.chat|default:"#"}

      Web Chat

      - +
      From 3418c3db77f271b8479610a975cb96906c8d4972 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 19:29:01 +1100 Subject: [PATCH 14/25] Update chat.inc.php --- public/include/pages/about/chat.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/pages/about/chat.inc.php b/public/include/pages/about/chat.inc.php index 0605a4c5..1cb78554 100644 --- a/public/include/pages/about/chat.inc.php +++ b/public/include/pages/about/chat.inc.php @@ -2,7 +2,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; // ACL check -switch($setting->getValue('acl_chat_page', 1)) { +switch($setting->getValue('system_chat_page', 2)) { case '0': if ($user->isAuthenticated()) { $smarty->assign("CONTENT", "default.tpl"); From aac9b70aac2f5fe477d5d36c7fe3b5cdd743b676 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 19:30:08 +1100 Subject: [PATCH 15/25] Update smarty_globals.inc.php --- public/include/smarty_globals.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index d2187891..8ec2eedf 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -124,8 +124,10 @@ $aGlobal['acl']['graphs']['statistics'] = $setting->getValue('acl_graphs_statist $aGlobal['acl']['donors']['page'] = $setting->getValue('acl_donors_page'); $aGlobal['acl']['about']['page'] = $setting->getValue('acl_about_page'); $aGlobal['acl']['contactform'] = $setting->getValue('acl_contactform'); -$aGlobal['acl']['chat']['page'] = $setting->getValue('acl_chat_page'); -$aGlobal['acl']['irc']['chat'] = $setting->getValue('acl_irc_chat'); + +// System +$aGlobal['system']['chat']['page'] = $setting->getValue('system_chat_page'); +$aGlobal['system']['irc']['chat'] = $setting->getValue('system_irc_chat', 2); // We don't want these session infos cached if (@$_SESSION['USERDATA']['id']) { From a9cc0a9ec9303c32f821f2802bfc9968c13e8416 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 19:56:51 +1100 Subject: [PATCH 16/25] Update smarty_globals.inc.php --- public/include/smarty_globals.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index 8ec2eedf..73c3cba9 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -124,10 +124,10 @@ $aGlobal['acl']['graphs']['statistics'] = $setting->getValue('acl_graphs_statist $aGlobal['acl']['donors']['page'] = $setting->getValue('acl_donors_page'); $aGlobal['acl']['about']['page'] = $setting->getValue('acl_about_page'); $aGlobal['acl']['contactform'] = $setting->getValue('acl_contactform'); +$aGlobal['acl']['irc']['chat'] = $setting->getValue('acl_chat_page', 2); // System -$aGlobal['system']['chat']['page'] = $setting->getValue('system_chat_page'); -$aGlobal['system']['irc']['chat'] = $setting->getValue('system_irc_chat', 2); +$aGlobal['system']['chat']['page'] = $setting->getValue('system_irc_chat'); // We don't want these session infos cached if (@$_SESSION['USERDATA']['id']) { From ae9c2205211c820c9ab74a83b0ed63127c9d7674 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:01:02 +1100 Subject: [PATCH 17/25] Update chat.inc.php --- public/include/pages/about/chat.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/pages/about/chat.inc.php b/public/include/pages/about/chat.inc.php index 1cb78554..0fc2bf83 100644 --- a/public/include/pages/about/chat.inc.php +++ b/public/include/pages/about/chat.inc.php @@ -2,7 +2,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; // ACL check -switch($setting->getValue('system_chat_page', 2)) { +switch($setting->getValue('acl_chat_page', 2)) { case '0': if ($user->isAuthenticated()) { $smarty->assign("CONTENT", "default.tpl"); From 17509aa3b901ae38c46b810a87a38d5310079c63 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:02:45 +1100 Subject: [PATCH 18/25] Update admin_settings.inc.php --- public/include/config/admin_settings.inc.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index cafe71a3..4e9d6a71 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -250,6 +250,13 @@ $aSettings['acl'][] = array( 'name' => 'acl_contactform', 'value' => $setting->getValue('acl_contactform'), 'tooltip' => 'Make the contactform private (users only) or public.' ); +$aSettings['acl'][] = array( + 'display' => 'Live Chat Page', 'type' => 'select', + 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), + 'default' => 2, + 'name' => 'acl_chat_page', 'value' => $setting->getValue('acl_chat_page'), + 'tooltip' => 'Make the chat page private (users only) or public.' +); $aSettings['system'][] = array( 'display' => 'E-mail address for system error notifications', 'type' => 'text', 'size' => 25, @@ -341,13 +348,6 @@ $aSettings['system'][] = array( 'name' => 'disable_transactionsummary', 'value' => $setting->getValue('disable_transactionsummary'), 'tooltip' => 'Disable transaction summaries. Helpful with large transaction tables.' ); -$aSettings['system'][] = array( - 'display' => 'Live Chat Page', 'type' => 'select', - 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), - 'default' => 2, - 'name' => 'system_chat_page', 'value' => $setting->getValue('system_chat_page'), - 'tooltip' => 'Make the chat page private (users only) or public.' -); $aSettings['system'][] = array( 'display' => 'IRC Chat Channel', 'type' => 'text', 'size' => 25, From 7f8c5e8270c97fde766f2d0551b4bc20450b35c8 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:18:14 +1100 Subject: [PATCH 19/25] Blah --- public/include/smarty_globals.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index 73c3cba9..6ddd0824 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -124,10 +124,10 @@ $aGlobal['acl']['graphs']['statistics'] = $setting->getValue('acl_graphs_statist $aGlobal['acl']['donors']['page'] = $setting->getValue('acl_donors_page'); $aGlobal['acl']['about']['page'] = $setting->getValue('acl_about_page'); $aGlobal['acl']['contactform'] = $setting->getValue('acl_contactform'); -$aGlobal['acl']['irc']['chat'] = $setting->getValue('acl_chat_page', 2); +$aGlobal['acl']['chat']['page'] = $setting->getValue('acl_chat_page', 2); // System -$aGlobal['system']['chat']['page'] = $setting->getValue('system_irc_chat'); +$aGlobal['system']['irc']['chat'] = $setting->getValue('system_irc_chat'); // We don't want these session infos cached if (@$_SESSION['USERDATA']['id']) { From 3ea023e6e007de9c225c641fd9c7ec8e6f733dea Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:21:27 +1100 Subject: [PATCH 20/25] Blah --- public/templates/mpos/global/navigation.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mpos/global/navigation.tpl b/public/templates/mpos/global/navigation.tpl index 4f147a1e..9d97235e 100644 --- a/public/templates/mpos/global/navigation.tpl +++ b/public/templates/mpos/global/navigation.tpl @@ -42,7 +42,7 @@
    • Getting Started
      • {acl_check icon='icon-doc' page='about' action='pool' name='About' acl=$GLOBAL.acl.about.page} {acl_check icon='icon-money' page='about' action='donors' name='Donors' acl=$GLOBAL.acl.donors.page} - {acl_check icon='icon-megaphone' page='about' action='chat' name='Web Chat' acl=$GLOBAL.system.chat.page} + {acl_check icon='icon-megaphone' page='about' action='chat' name='Web Chat' acl=$GLOBAL.acl.chat.page}

    Other

      From 624c613c89802acaf7314c4d9c5b7d6f7e40d59a Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:28:09 +1100 Subject: [PATCH 21/25] Update admin_settings.inc.php --- public/include/config/admin_settings.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index 4e9d6a71..eeb7d035 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -351,7 +351,7 @@ $aSettings['system'][] = array( $aSettings['system'][] = array( 'display' => 'IRC Chat Channel', 'type' => 'text', 'size' => 25, - 'default' => '#', + 'default' => '#lazypoolop', 'name' => 'system_irc_chat', 'value' => $setting->getValue('system_irc_chat'), 'tooltip' => 'Your IRC support channel name.' ); From 0c064d4d58471a80108c9a9040263e6caf0940e5 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:28:49 +1100 Subject: [PATCH 22/25] Update default.tpl --- public/templates/mpos/about/chat/default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/mpos/about/chat/default.tpl b/public/templates/mpos/about/chat/default.tpl index 753a6ee3..dc5074be 100644 --- a/public/templates/mpos/about/chat/default.tpl +++ b/public/templates/mpos/about/chat/default.tpl @@ -1,9 +1,9 @@ -

      If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$GLOBAL.system.irc.chat|default:"#"}

      +

      If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$GLOBAL.system.irc.chat|default:"#lazypoolop"}

      Web Chat

      - +
      From d5c63ff82430df4e08f2fcd4492b554f941891cc Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 20:32:00 +1100 Subject: [PATCH 23/25] Update smarty_globals.inc.php --- public/include/smarty_globals.inc.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index 6ddd0824..d36080f8 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -126,9 +126,6 @@ $aGlobal['acl']['about']['page'] = $setting->getValue('acl_about_page'); $aGlobal['acl']['contactform'] = $setting->getValue('acl_contactform'); $aGlobal['acl']['chat']['page'] = $setting->getValue('acl_chat_page', 2); -// System -$aGlobal['system']['irc']['chat'] = $setting->getValue('system_irc_chat'); - // We don't want these session infos cached if (@$_SESSION['USERDATA']['id']) { $aGlobal['userdata'] = $_SESSION['USERDATA']['id'] ? $user->getUserData($_SESSION['USERDATA']['id']) : array(); From 966d32036ba2c2efe9797065cad6aaf939a4afa7 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 21:12:15 +1100 Subject: [PATCH 24/25] Update chat.inc.php --- public/include/pages/about/chat.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/include/pages/about/chat.inc.php b/public/include/pages/about/chat.inc.php index 0fc2bf83..a5150163 100644 --- a/public/include/pages/about/chat.inc.php +++ b/public/include/pages/about/chat.inc.php @@ -5,10 +5,12 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; switch($setting->getValue('acl_chat_page', 2)) { case '0': if ($user->isAuthenticated()) { + $smarty->assign('CHATROOM', $setting->getValue('system_irc_chat', '#lazypoolop')); $smarty->assign("CONTENT", "default.tpl"); } break; case '1': + $smarty->assign('CHATROOM', $setting->getValue('system_irc_chat', '#lazypoolop')); $smarty->assign("CONTENT", "default.tpl"); break; case '2': From 02568df75904bc69288453e80a5690073350f1c5 Mon Sep 17 00:00:00 2001 From: Nathan Patten Date: Mon, 24 Feb 2014 21:16:14 +1100 Subject: [PATCH 25/25] Update default.tpl --- public/templates/mpos/about/chat/default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/mpos/about/chat/default.tpl b/public/templates/mpos/about/chat/default.tpl index dc5074be..77bd358f 100644 --- a/public/templates/mpos/about/chat/default.tpl +++ b/public/templates/mpos/about/chat/default.tpl @@ -1,9 +1,9 @@ -

      If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$GLOBAL.system.irc.chat|default:"#lazypoolop"}

      +

      If you have your own irc client feel free to connect to our channel @ IRC.FREENODE.NET {$CHATROOM|default:"#lazypoolop"}

      Web Chat

      - +