1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-22 06:03:27 +02:00

Code Cleanup

This commit is contained in:
Cameron
2019-05-20 14:53:43 -07:00
parent 6a2fdab074
commit bdb45485ee
27 changed files with 55 additions and 44 deletions

View File

@@ -94,7 +94,7 @@ class contact_shortcodes extends e_shortcode
/* example {CONTACT_NAME: class=form-control} */
/* example {CONTACT_NAME: class=col-md-12&placeholder=".LANCONTACT_03." *} */
function sc_contact_name($parm='')
function sc_contact_name($parm=null)
{
$userName = deftrue('USERNAME');
$class = (!empty($parm['class'])) ? $parm['class'] : 'tbox form-control';
@@ -109,7 +109,7 @@ class contact_shortcodes extends e_shortcode
/* example {CONTACT_EMAIL: class=form-control} */
/* example {CONTACT_EMAIL: class=col-md-12&placeholder=".LANCONTACT_04." *} */
function sc_contact_email($parm='')
function sc_contact_email($parm=null)
{
$userEmail = deftrue('USEREMAIL');
$disabled = (!empty($userEmail)) ? 'readonly' : ''; // don't allow change from a verified email address.
@@ -126,7 +126,7 @@ class contact_shortcodes extends e_shortcode
/* example {CONTACT_SUBJECT: class=form-control} */
/* example {CONTACT_SUBJECT: class=col-md-12&placeholder=".LANCONTACT_05." *} */
function sc_contact_subject($parm='')
function sc_contact_subject($parm=null)
{
$class = (!empty($parm['class'])) ? $parm['class'] : 'tbox form-control';
$placeholder = (!empty($parm['placeholder'])) ? " placeholder= '".$parm['placeholder']."'" : '';
@@ -161,14 +161,14 @@ class contact_shortcodes extends e_shortcode
/* example {CONTACT_SUBMIT_BUTTON} */
/* example {CONTACT_SUBMIT_BUTTON: class=contact submit btn btn-minimal} */
function sc_contact_submit_button($parm='')
function sc_contact_submit_button($parm=null)
{
$class = (!empty($parm['class'])) ? $parm['class'] : 'btn btn-primary button';
return "<input type='submit' name='send-contactus' value=\"".LANCONTACT_08."\" class='".$class."' />";
}
function sc_contact_gdpr_check($parm='')
function sc_contact_gdpr_check($parm=null)
{
$parm['class'] = (!empty($parm['class'])) ? $parm['class'] : '';
$parm = array_merge(array('required'=>1), $parm);
@@ -176,7 +176,7 @@ class contact_shortcodes extends e_shortcode
}
/* {CONTACT_GDPR_LINK} */
function sc_contact_gdpr_link($parm='')
function sc_contact_gdpr_link($parm=null)
{
$pp = e107::getPref('gdpr_privacypolicy', '');
if (!$pp)

View File

@@ -44,7 +44,7 @@ class login_shortcodes extends e_shortcode
/* example: {LOGIN_TABLE_USERNAME} */
/* example: {LOGIN_TABLE_USERNAME: class=form-control} */
function sc_login_table_username($parm='') //FIXME use $frm
function sc_login_table_username($parm=null) //FIXME use $frm
{
if(empty($this->userReg))
@@ -63,7 +63,7 @@ class login_shortcodes extends e_shortcode
/* example: {LOGIN_TABLE_PASSWORD} */
/* example: {LOGIN_TABLE_PASSWORD: class=form-control} */
function sc_login_table_password($parm='') //FIXME use $frm
function sc_login_table_password($parm=null) //FIXME use $frm
{
if(empty($this->userReg))
{
@@ -165,7 +165,7 @@ class login_shortcodes extends e_shortcode
/* example: {LOGIN_TABLE_SUBMIT=large} */
/* example: {LOGIN_TABLE_SUBMIT: class=btn submit_but} */
function sc_login_table_submit($parm="") //FIXME use $frm
function sc_login_table_submit($parm=null) //FIXME use $frm
{
if(empty($this->userReg))
@@ -198,7 +198,7 @@ class login_shortcodes extends e_shortcode
/* example {LOGIN_TABLE_SIGNUP_LINK} */
/* example {LOGIN_TABLE_SIGNUP_LINK: class=hover-black dg-btn-2 radius-3px btn-white hover-accent size-lg} */
function sc_login_table_signup_link($parm='')
function sc_login_table_signup_link($parm=null)
{
if($this->userReg === 1)
@@ -214,13 +214,14 @@ class login_shortcodes extends e_shortcode
/* example {LOGIN_TABLE_FPW_LINK} */
/* example {LOGIN_TABLE_FPW_LINK: class=dg-btn-2 btn-white radius-3px hover-white size-xl} */
function sc_login_table_fpw_link($parm='')
function sc_login_table_fpw_link($parm=null)
{
if(empty($this->userReg))
{
return null;
}
$class = (!empty($parm['class'])) ? "class='".$parm['class']."'" : "";
$class = (!empty($parm['class'])) ? "class='".$parm['class']."'" : "";
return "<a href='".e_HTTP."fpw.php' ".$class.">".LAN_LOGIN_12."</a>";
}

View File

@@ -1150,7 +1150,7 @@ class news_shortcodes extends e_shortcode
return $info;
}
function sc_newstags($parm='')
function sc_newstags($parm=null)
{
$tmp = explode(",",$this->news_item['news_meta_keywords']);
$words = array();

View File

@@ -161,7 +161,7 @@ class signup_shortcodes extends e_shortcode
/* example: {SIGNUP_SIGNUP_TEXT}
/* example: {SIGNUP_SIGNUP_TEXT: class=custom} */
function sc_signup_signup_text($parm='')
function sc_signup_signup_text($parm=null)
{
$pref = e107::getPref();
$tp = e107::getParser();
@@ -650,7 +650,7 @@ class signup_shortcodes extends e_shortcode
* @example {SIGNUP_GDPR_PRIVACYPOLICY_LINK}
* @example {SIGNUP_GDPR_PRIVACYPOLICY_LINK: class=label label-info}
*/
function sc_signup_gdpr_privacypolicy_link($parm='')
function sc_signup_gdpr_privacypolicy_link($parm=null)
{
$pp = e107::getPref('gdpr_privacypolicy', '');
if (!$pp)
@@ -668,7 +668,7 @@ class signup_shortcodes extends e_shortcode
* @example {SIGNUP_GDPR_TERMSANDCONDITIONS_LINK}
* @example {SIGNUP_GDPR_TERMSANDCONDITIONS_LINK: class=label label-info}
*/
function sc_signup_gdpr_termsandconditions_link($parm='')
function sc_signup_gdpr_termsandconditions_link($parm=null)
{
$pp = e107::getPref('gdpr_termsandconditions', '');
if (!$pp)

View File

@@ -666,7 +666,7 @@ function sc_user_email($parm='')
* @param string $parm
* @return string
*/
function sc_user_euf($parm='')
function sc_user_euf($parm=null)
{
if(!empty($parm['field']))