Changeset 766423

Timestamp:

09/03/2013 06:47:13 PM (13 years ago)

Author:

bobbravo2

Message:

strict standards fix

Location:

wordpress-by-circle-tree

Files:

• .externalToolBuilders/wp by circle tree build.launch (modified) (1 diff)
• trunk/css/circletree-login.css (modified) (2 diffs)
• trunk/css/circletree-login.min.css (modified) (1 diff)
• trunk/includes/class.wp_by_ct.php (modified) (1 diff)
• trunk/includes/pages/log.php (modified) (2 diffs)
• trunk/wordpress-by-circletree.php (modified) (3 diffs)

wordpress-by-circle-tree/.externalToolBuilders/wp by circle tree build.launch

@@ -2 +2 @@
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/build.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/readme.txt&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/css/circletree-login.css&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/css/jquery.dataTables.css&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/css/jquery.dataTables_themeroller.css&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/images&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/includes&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/js&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/wordpress-by-circle-tree/trunk/wordpress-by-circletree.php&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/Applications/MAMP/bin/php/php5.3.14/bin/phing"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>

wordpress-by-circle-tree/trunk/css/circletree-login.css

@@ -401 +401 @@
     z-index: 99;
 }
+.interim-login #login H1 A {
+    height: 110px;
+}
+.interim-login #login form {
+    padding-top:5px; 
+}
+.interim-login #ip_logged_notice {
+    display: none;
+}
+.interim-login h2.byct_lockdown {
+    margin-bottom: 5px;
+}
+@media screen and (min-height: 520px)
+{
+    .interim-login #ip_logged_notice {
+        display: block;
+    }
+}
 @media screen and (max-width: 480px)
 {
@@ -422 +440 @@
     }
     #login {
-        width: 100%;
+        width: 98%;
         max-width: 450px;
     }

wordpress-by-circle-tree/trunk/css/circletree-login.min.css

@@ -1 @@
-#ip_logged_notice:after,.dataTables_wrapper:after{content:".";display:block;height:0;clear:both;visibility:hidden;font-size:0}#ip_logged_notice{display:inline-block}#ip_logged_notice{/*\*/display:block;/**/-height:1px}.block-box{position:absolute;right:15px;top:5px;border:1px solid #f9f9f9;padding:0}#whitelist.block-box{position:absolute;right:203px;top:5px}.block-box FORM{padding:5px}.block-box H3{line-height:1;margin:0 0 5px;border-bottom:1px solid #dadada;padding:5px;background:#f1f1f1;background-image:-webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));background-image:-webkit-linear-gradient(bottom,#ececec,#f9f9f9);background-image:-moz-linear-gradient(bottom,#ececec,#f9f9f9);background-image:-o-linear-gradient(bottom,#ececec,#f9f9f9);background-image:linear-gradient(to top,#ececec,#f9f9f9)}#login H1 A{width:450px;height:200px;background-size:inherit;background-image:url(../images/header.png);margin-left:auto;margin-right:auto;position:relative;left:0;top:0}#login{width:550px}#header-logo{background-image:url(https://s3.amazonaws.com/myct2/footer-logo-16px.png)!important}#icon-byct_log,#icon-byct_settings{background-image:url(../images/screen_icons.png)}#icon-byct_log{background-position:-7px -6px}#icon-byct_settings{background-position:-68px -6px}#login_error{width:96%;margin:0 auto 20px}#login_error H2{line-height:1.3;font-size:16pt}.dashboard_page_circle_tree_login_log .refresh_form .byct_loading{position:absolute;margin-left:70px;margin-top:-20px}#blocked.col_wrapper H3,#whitelisted.col_wrapper H3{width:100px}#whitelisted.col_wrapper H3{border-bottom:2px solid #d6fad6;-moz-text-shadow:1px 1px 2px #d6fad6;-webkit-text-shadow:1px 1px 2px #d6fad6;-o-text-shadow:1px 1px 2px #d6fad6;text-shadow:1px 1px 2px #d6fad6}#blocked.col_wrapper H3{border-bottom:2px solid #fdd7d7;-moz-text-shadow:1px 1px 2px #fdd7d7;-webkit-text-shadow:1px 1px 2px #fdd7d7;-o-text-shadow:1px 1px 2px #fdd7d7;text-shadow:1px 1px 2px #fdd7d7}.dashboard_page_circle_tree_login_log .col_wrapper{width:48%}@media screen and (max-width:1100px){.dashboard_page_circle_tree_login_log .col_wrapper{width:100%}}.dashboard_page_circle_tree_login_log .col_wrapper{float:left;position:relative;left:0;top:0;padding:0;margin:5px}.dataTables_wrapper{margin-bottom:20px}.dataTables_wrapper .dataTables_filter LABEL,.dataTables_wrapper .dataTables_length LABEL{color:#333;font-size:10px}.dataTables_wrapper .dataTables_info{font-style:italic;color:#979797;font-size:10px;float:none;position:absolute;right:0;bottom:-18px}.dataTables_wrapper .paging_full_numbers .paginate_button_disabled{display:none}.dataTables_wrapper .dataTables_length{position:absolute;right:207px;top:-25px}.dataTables_wrapper .dataTables_filter{position:absolute;right:0;top:-26px}.byct_loading{background-image:url(../images/wpspin.gif);background-repeat:no-repeat;width:20px;height:20px;display:block}.block-box .ajax .byct_loading{position:absolute;right:6px;top:4px}TABLE.dataTable .ajax .byct_loading{position:absolute;margin-left:4px;margin-top:-20px}TABLE.dataTable #blocked-ips .ajax .byct_loading,TABLE.dataTable #whitelisted-ips .ajax .byct_loading{position:absolute;margin-left:73px;margin-top:-20px}#lockdown H1{color:#000}#lockdown{background-color:#ffefef;text-align:center;padding:20px;border:4px double #f00;min-width:320px}#lockdown #recaptcha_widget_div{margin:0 auto;width:318px}#error-page{min-width:320px}#reset_log .warning:before{content:'WARNING: This is your current IP';display:block}#reset_log .warning{background-color:#fdd}.byct_lockdown{color:#000;font-size:10pt;text-align:center}H2.byct_lockdown{font-size:12pt}#ip_logged_notice{font-size:8pt;width:90%;margin-left:auto;margin-right:auto;position:relative;left:0;top:0;margin-bottom:10px;margin-top:10px}#ip_logged_notice .ip_logged{float:left;position:relative;left:11px;top:0;width:44%;height:100%;margin-top:7px}#ip_logged_notice .notice{width:50%;float:right;position:relative;left:0;top:0;color:#696969;font-style:italic}#backtoblog A{font-size:10pt;display:block;margin-left:-20px;text-decoration:none}#login #nav A{font-size:10pt;text-decoration:none}#ip_logged_notice .ip_logged{height:100%;display:block}#lockdown INPUT:disabled{background-color:#fff;background-image:none}#lockdown INPUT:disabled,.disabled{cursor:wait}#lockdown INPUT.button{margin-top:20px}.byct_tooltip{display:inline;position:relative}.dataTables_wrapper .widefat{visibility:visible!important}.byct_tooltip:hover:after{background:#333;background:rgba(0,0,0,0.8);border-radius:5px;bottom:26px;color:#FFF;content:attr(title);left:20%;padding:5px 15px;position:absolute;z-index:98;width:220px}.byct_messages{width:350px;position:fixed;opacity:1;top:35px;left:160px;z-index:2}a.disabled{color:#aaa!important;border-color:#ddd!important;background-image:-webkit-gradient(linear,left top,left bottom,from(#f9f9f9),to(#f4f4f4))!important;background-image:-webkit-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:-moz-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:-ms-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:-o-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:linear-gradient(to bottom,#f9f9f9,#f4f4f4)!important;-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:0 1px 0 #fff!important;cursor:default}.folded .byct_messages{left:50px}.form-table td.label{text-align:right}h2 sup{font-size:8pt}.widefat .ip{width:150px;text-align:right}.byct_tooltip:hover:before{border:solid;border-color:#333 transparent;border-width:6px 6px 0;bottom:20px;content:"";left:50%;position:absolute;z-index:99}@media screen and (max-width:480px){#loginform{padding-left:5px;padding-right:5px;margin-right:10px;left:5px}#login H1 A{width:320px}#login{padding-top:20px}}@media screen and (max-width:640px){body.login{min-width:330px}#login{width:100%;max-width:450px}#loginform{padding-left:10px;padding-right:10px}#login H1 A{background-image:url(../images/header-mobile.png);height:120px}}@media screen and (max-width:640px) and (min-resolution:120dpi),(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:15/10),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){#login H1 A{background-image:url(../images/header-mobile2x.png);height:120px;background-size:320px 114px}}@media screen and (min-width:768px) and (min-resolution:120dpi),(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:15/10),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){#login H1 A{background-image:url(../images/header2x.png);background-size:450px 160px;height:160px}.byct_loading{background-image:url(../images/wpspin-2x.gif);background-size:16px 16px}}
+#ip_logged_notice:after,.dataTables_wrapper:after{content:".";display:block;height:0;clear:both;visibility:hidden;font-size:0}#ip_logged_notice{display:inline-block}#ip_logged_notice{/*\*/display:block;/**/-height:1px}.block-box{position:absolute;right:15px;top:5px;border:1px solid #f9f9f9;padding:0}#whitelist.block-box{position:absolute;right:203px;top:5px}.block-box FORM{padding:5px}.block-box H3{line-height:1;margin:0 0 5px;border-bottom:1px solid #dadada;padding:5px;background:#f1f1f1;background-image:-webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));background-image:-webkit-linear-gradient(bottom,#ececec,#f9f9f9);background-image:-moz-linear-gradient(bottom,#ececec,#f9f9f9);background-image:-o-linear-gradient(bottom,#ececec,#f9f9f9);background-image:linear-gradient(to top,#ececec,#f9f9f9)}#login H1 A{width:450px;height:200px;background-size:inherit;background-image:url(../images/header.png);margin-left:auto;margin-right:auto;position:relative;left:0;top:0}#login{width:550px}#header-logo{background-image:url(https://s3.amazonaws.com/myct2/footer-logo-16px.png)!important}#icon-byct_log,#icon-byct_settings{background-image:url(../images/screen_icons.png)}#icon-byct_log{background-position:-7px -6px}#icon-byct_settings{background-position:-68px -6px}#login_error{width:96%;margin:0 auto 20px}#login_error H2{line-height:1.3;font-size:16pt}.dashboard_page_circle_tree_login_log .refresh_form .byct_loading{position:absolute;margin-left:70px;margin-top:-20px}#blocked.col_wrapper H3,#whitelisted.col_wrapper H3{width:100px}#whitelisted.col_wrapper H3{border-bottom:2px solid #d6fad6;-moz-text-shadow:1px 1px 2px #d6fad6;-webkit-text-shadow:1px 1px 2px #d6fad6;-o-text-shadow:1px 1px 2px #d6fad6;text-shadow:1px 1px 2px #d6fad6}#blocked.col_wrapper H3{border-bottom:2px solid #fdd7d7;-moz-text-shadow:1px 1px 2px #fdd7d7;-webkit-text-shadow:1px 1px 2px #fdd7d7;-o-text-shadow:1px 1px 2px #fdd7d7;text-shadow:1px 1px 2px #fdd7d7}.dashboard_page_circle_tree_login_log .col_wrapper{width:48%}@media screen and (max-width:1100px){.dashboard_page_circle_tree_login_log .col_wrapper{width:100%}}.dashboard_page_circle_tree_login_log .col_wrapper{float:left;position:relative;left:0;top:0;padding:0;margin:5px}.dataTables_wrapper{margin-bottom:20px}.dataTables_wrapper .dataTables_filter LABEL,.dataTables_wrapper .dataTables_length LABEL{color:#333;font-size:10px}.dataTables_wrapper .dataTables_info{font-style:italic;color:#979797;font-size:10px;float:none;position:absolute;right:0;bottom:-18px}.dataTables_wrapper .paging_full_numbers .paginate_button_disabled{display:none}.dataTables_wrapper .dataTables_length{position:absolute;right:207px;top:-25px}.dataTables_wrapper .dataTables_filter{position:absolute;right:0;top:-26px}.byct_loading{background-image:url(../images/wpspin.gif);background-repeat:no-repeat;width:20px;height:20px;display:block}.block-box .ajax .byct_loading{position:absolute;right:6px;top:4px}TABLE.dataTable .ajax .byct_loading{position:absolute;margin-left:4px;margin-top:-20px}TABLE.dataTable #blocked-ips .ajax .byct_loading,TABLE.dataTable #whitelisted-ips .ajax .byct_loading{position:absolute;margin-left:73px;margin-top:-20px}#lockdown H1{color:#000}#lockdown{background-color:#ffefef;text-align:center;padding:20px;border:4px double #f00;min-width:320px}#lockdown #recaptcha_widget_div{margin:0 auto;width:318px}#error-page{min-width:320px}#reset_log .warning:before{content:'WARNING: This is your current IP';display:block}#reset_log .warning{background-color:#fdd}.byct_lockdown{color:#000;font-size:10pt;text-align:center}H2.byct_lockdown{font-size:12pt}#ip_logged_notice{font-size:8pt;width:90%;margin-left:auto;margin-right:auto;position:relative;left:0;top:0;margin-bottom:10px;margin-top:10px}#ip_logged_notice .ip_logged{float:left;position:relative;left:11px;top:0;width:44%;height:100%;margin-top:7px}#ip_logged_notice .notice{width:50%;float:right;position:relative;left:0;top:0;color:#696969;font-style:italic}#backtoblog A{font-size:10pt;display:block;margin-left:-20px;text-decoration:none}#login #nav A{font-size:10pt;text-decoration:none}#ip_logged_notice .ip_logged{height:100%;display:block}#lockdown INPUT:disabled{background-color:#fff;background-image:none}#lockdown INPUT:disabled,.disabled{cursor:wait}#lockdown INPUT.button{margin-top:20px}.byct_tooltip{display:inline;position:relative}.dataTables_wrapper .widefat{visibility:visible!important}.byct_tooltip:hover:after{background:#333;background:rgba(0,0,0,0.8);border-radius:5px;bottom:26px;color:#FFF;content:attr(title);left:20%;padding:5px 15px;position:absolute;z-index:98;width:220px}.byct_messages{width:350px;position:fixed;opacity:1;top:35px;left:160px;z-index:2}a.disabled{color:#aaa!important;border-color:#ddd!important;background-image:-webkit-gradient(linear,left top,left bottom,from(#f9f9f9),to(#f4f4f4))!important;background-image:-webkit-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:-moz-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:-ms-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:-o-linear-gradient(top,#f9f9f9,#f4f4f4)!important;background-image:linear-gradient(to bottom,#f9f9f9,#f4f4f4)!important;-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:0 1px 0 #fff!important;cursor:default}.folded .byct_messages{left:50px}.form-table td.label{text-align:right}h2 sup{font-size:8pt}.widefat .ip{width:150px;text-align:right}.byct_tooltip:hover:before{border:solid;border-color:#333 transparent;border-width:6px 6px 0;bottom:20px;content:"";left:50%;position:absolute;z-index:99}.interim-login #login H1 A{height:110px}.interim-login #login form{padding-top:5px}.interim-login #ip_logged_notice{display:none}.interim-login h2.byct_lockdown{margin-bottom:5px}@media screen and (min-height:520px){.interim-login #ip_logged_notice{display:block}}@media screen and (max-width:480px){#loginform{padding-left:5px;padding-right:5px;margin-right:10px;left:5px}#login H1 A{width:320px}#login{padding-top:20px}}@media screen and (max-width:640px){body.login{min-width:330px}#login{width:98%;max-width:450px}#loginform{padding-left:10px;padding-right:10px}#login H1 A{background-image:url(../images/header-mobile.png);height:120px}}@media screen and (max-width:640px) and (min-resolution:120dpi),(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:15/10),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){#login H1 A{background-image:url(../images/header-mobile2x.png);height:120px;background-size:320px 114px}}@media screen and (min-width:768px) and (min-resolution:120dpi),(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:15/10),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){#login H1 A{background-image:url(../images/header2x.png);background-size:450px 160px;height:160px}.byct_loading{background-image:url(../images/wpspin-2x.gif);background-size:16px 16px}}

wordpress-by-circle-tree/trunk/includes/class.wp_by_ct.php

@@ -55 +55 @@
     }
     public static function echo_stylesheet_link () {
-        echo '<link rel="stylesheet" type="text/css" href="' . wp_by_ct::get_url() . '/circletree-login.css" />';
+        echo '<link rel="stylesheet" type="text/css" href="' . wp_by_ct::get_url() . 'css/circletree-login.css" />';
     }
     /**

wordpress-by-circle-tree/trunk/includes/pages/log.php

@@ -10 +10 @@
 </form>
 <?php 
+}
+if (! isset($_SESSION['msg'])) {
+    $_SESSION['msg'] = -1;
 } 
 /**
@@ -60 +63 @@
             <p>Please refresh the page and try again.</p>
         </div>
-        <div class="byct_messages code_11 error <?php if ($_SESSION['msg'] != 10) :?>hidden<?php endif;?>">
+        <div class="byct_messages code_11 error <?php if ($_SESSION['msg'] != 11) :?>hidden<?php endif;?>">
             <p>Private IP Addresses are not allowed.</p>
         </div>
-        <div class="byct_messages code_12 updated <?php if ($_SESSION['msg'] != 10) :?>hidden<?php endif;?>">
+        <div class="byct_messages code_12 updated <?php if ($_SESSION['msg'] != 12) :?>hidden<?php endif;?>">
             <p>Refreshed.</p>
         </div>

wordpress-by-circle-tree/trunk/wordpress-by-circletree.php

@@ -5 +5 @@
 Description: Secure Login Screen for Circle Tree powered websites
 Author: Circle Tree, LLC
-Version: 3.0.6
+Version: 3.0.7
 Author URI: http://mycircletree.com/
 */
@@ -16 +16 @@
  */ 
 defined('DS') OR define('DS', DIRECTORY_SEPARATOR); 
+require_once WP_PLUGIN_DIR . DS . 'wordpress-by-circle-tree' . DS . 'includes' . DS . 'class.wp_login_lockdown.php';
 /**
  * Number of password attempts before displaying a CAPTCHA
  */
-require_once WP_PLUGIN_DIR . DS . 'wordpress-by-circle-tree' . DS . 'includes' . DS . 'class.wp_login_lockdown.php';
+$lockdown = new wp_login_lockdown;
 if (! defined('LOGIN_LOCKDOWN_ATTEMPTS'))  {
-    $setting = wp_login_lockdown::get_setting('login_lockdown_attempts');
+    $setting = $lockdown->get_setting('login_lockdown_attempts');
     //Default override
     if (false === $setting) {
@@ -42 +43 @@
 
 new wp_by_ct;
-new wp_login_lockdown;
+