mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-25 07:21:03 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:e107inc/e107

Browse Source
This commit is contained in:
SecretR
2014-09-18 19:08:16 +03:00
parent 44d10ee5ce f9d521ad04
commit e636fba0be
37 changed files with 964 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/bbcodes/file.bb
View File

@@ -8,7 +8,7 @@ $class = e107::getBB()->getClass('file');
if(is_numeric($parm)) // Media-Manager file.
{
return "<a class='".$class."' href='".e_BASE."request.php?file={$parm}'>".$code_text."</a>";
return "<a class='".$class."' href='".e_HTTP."request.php?file={$parm}'>".$code_text."</a>";
}

22
e107_core/shortcodes/batch/usersettings_shortcodes.php
View File

@@ -141,7 +141,7 @@ class usersettings_shortcodes extends e_shortcode
if($parm == 'radio')
{
$options['enabled'] = array('title' => LAN_USER_84);
return e107::getForm()->radio_switch("hideemail", $this->var['user_hideemail'],LAN_YES,LAN_NO,$options);
return "<div class='radio'>".e107::getForm()->radio_switch("hideemail", $this->var['user_hideemail'],LAN_YES,LAN_NO,$options)."</div>";
}
}
@@ -238,14 +238,26 @@ class usersettings_shortcodes extends e_shortcode
function sc_photo_upload($parm)
{
$diz = LAN_USET_27."<br />".LAN_USET_28;
$diz = LAN_USET_27.". ".LAN_USET_28.".";
if(USERPHOTO)
{
$text .= e107::getParser()->parseTemplate("{PICTURE}",true);
}
if (e107::getPref('photo_upload') && FILE_UPLOADS)
{
return "<input type='checkbox' name='user_delete_photo' value='1' />".LAN_USET_16."<br />\n
<input class='tbox' name='file_userfile[photo]' type='file' size='47' />
<div class='field-help'>{$diz}</div>";
$text .= "<div class='checkbox'>";
$text .= e107::getForm()->checkbox('user_delete_photo', 1, false, LAN_USET_16);
$text .= "</div>";
// $text .= "<input type='checkbox' name='user_delete_photo' value='1' />".LAN_USET_16."<br />\n";
$text .= "<p><input class='tbox' name='file_userfile[photo]' type='file' size='47' title=\"".$diz."\" /></p>\n";
}
return $text;
}

5
e107_core/shortcodes/single/user_avatar.php
View File

@@ -27,7 +27,7 @@ function user_avatar_shortcode($parm=null)
$image=$row['user_image'];
}
}
elseif(!is_null($parm))
elseif(!empty($parm))
{
$image=$parm;
}
@@ -56,6 +56,7 @@ function user_avatar_shortcode($parm=null)
}
elseif(substr($image,0,8) == "-upload-")
{
$image = substr($image,8); // strip the -upload- from the beginning.
if(file_exists(e_AVATAR_UPLOAD.$image)) // Local Default Image
{
@@ -63,6 +64,7 @@ function user_avatar_shortcode($parm=null)
}
else
{
$img = $genericImg;
}
}
@@ -72,6 +74,7 @@ function user_avatar_shortcode($parm=null)
}
else // Image Missing.
{
$img = $genericImg;
}
}

87
e107_core/templates/email_template.php
View File

@@ -191,12 +191,11 @@ $MAILOUT_FOOTER = "
*/
// FIXME clean up the whole email template/render tempalte mess
//-------------------------------------------------------------
// 'SIGNUP' TEMPLATE
//-------------------------------------------------------------
//@Deprecated
$SIGNUPEMAIL_TEMPLATE = "
<div style='padding:10px'>
<div style='text-align:left; width:90%'>
@@ -229,26 +228,7 @@ LAN_SIGNUP_97." {SITENAME}<br />
//-------------------------------------------------------------
// 'NOTIFY' TEMPLATE
//-------------------------------------------------------------
$NOTIFY_TEMPLATE = array(
'template_name' => 'Notify',
'template_type' => 'system',
'email_overrides' => '',
'email_header' => "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
<html xmlns='http://www.w3.org/1999/xhtml' >
<head>
<meta http-equiv='content-type' content='text/html; charset=utf-8' />
</head>
<body>
<div style='padding:0px 10px'>
",
'email_body' => '{BODY}',
'email_footer' => "<br /><br />
{SITENAME=link}
</div>
</body>
</html>",
'email_plainText' => ''
);
//-------------------------------------------------------------
@@ -309,19 +289,11 @@ $MONTHLYUPDATE_TEMPLATE = array(
$QUICKADDUSER_TEMPLATE = array(
'template_name' => 'Quick-Add-User',
'template_type' => 'quickadd',
'email_overrides' => '',
// 'email_header' - any header information (usually loaded from the default)
'email_body' => USRLAN_185.USRLAN_186,
// 'email_footer' => 'footer'
);
// ----------------------- Everything above this line is deprecated but may continue to work for a while ------------------------------- //
/** Standardized v2 template rewrite
@@ -334,6 +306,7 @@ $QUICKADDUSER_TEMPLATE = array(
// Default - test email and when no template specified.
$EMAIL_TEMPLATE['default']['name'] = 'Default';
$EMAIL_TEMPLATE['default']['subject'] = '{SUBJECT} {SITENAME}';
$EMAIL_TEMPLATE['default']['header'] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
<html xmlns='http://www.w3.org/1999/xhtml' >
<head>
@@ -356,9 +329,16 @@ $EMAIL_TEMPLATE['default']['footer'] = "<br /><br />
</body>
</html>";
// -------------------------------
// Signup Template.
/**
* Signup Template.
* @example developer tests
* signup.php?preview
* signup.php?test
* signup.php?preview.aftersignup
*/
$EMAIL_TEMPLATE['signup']['subject'] = LAN_SIGNUP_96.' {SITENAME}';
$EMAIL_TEMPLATE['signup']['header'] = $EMAIL_TEMPLATE['default']['header'];
@@ -386,7 +366,7 @@ $EMAIL_TEMPLATE['signup']['body'] = "
{SITENAME=link}<br />
{SITEURL}
<br /><br />".($includeSiteButton ? "<a href='".SITEURL."' title=''><img src='".e_IMAGE_ABS.str_replace('{e_IMAGE}', '', $includeSiteButton)."' alt='' /></a>" : '')."
<br /><br />".($includeSiteButton ? "<a href='".SITEURL."' title=''>{SITEBUTTON}</a>" : '')."
</div>
";
@@ -396,6 +376,11 @@ $EMAIL_TEMPLATE['signup']['footer'] = "</div>
$EMAIL_TEMPLATE['signup']['cc'] = "";
$EMAIL_TEMPLATE['signup']['bcc'] = "";
$EMAIL_TEMPLATE['signup']['attachments'] = "";
//TODO FIXME {SITEBUTTON} not working at the moment. (broken path)
// -----------------------------
/*
* QUICK ADD USER EMAIL TEMPLATE - BODY.
@@ -404,15 +389,37 @@ $EMAIL_TEMPLATE['signup']['attachments'] = "";
USRLAN_186 = Please go to the site as soon as possible and log in, then change your password using the \'Settings\' option.<br /><br />
You can also change other settings at the same time.<br /><br />Note that your password cannot be recovered if you lose it.
*/
$EMAIL_TEMPLATE['quickadd']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above.
$EMAIL_TEMPLATE['quickadd']['body'] = USRLAN_185.USRLAN_186;
$EMAIL_TEMPLATE['quickadd']['footer'] = $EMAIL_TEMPLATE['default']['footer']; // will use default footer above.
$EMAIL_TEMPLATE['quickadduser']['subject'] = '{SITENAME}: {SUBJECT} ';
$EMAIL_TEMPLATE['quickadduser']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above.
$EMAIL_TEMPLATE['quickadduser']['body'] = USRLAN_185.USRLAN_186;
$EMAIL_TEMPLATE['quickadduser']['footer'] = $EMAIL_TEMPLATE['default']['footer']; // will use default footer above.
// Notify (@see admin-> notify) // TODO
$EMAIL_TEMPLATE['notify']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above.
$EMAIL_TEMPLATE['notify']['body'] = $EMAIL_TEMPLATE['default']['body']; // will use default header above.
$EMAIL_TEMPLATE['notify']['footer'] = $EMAIL_TEMPLATE['default']['footer']; // will use default header above.
// ---------------------------------
// Notify (@see admin-> notify)
$EMAIL_TEMPLATE['notify']['subject'] = '{SITENAME}: {SUBJECT} ';
$EMAIL_TEMPLATE['notify']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above.
$EMAIL_TEMPLATE['notify']['body'] = $EMAIL_TEMPLATE['default']['body']; // will use default header above.
$EMAIL_TEMPLATE['notify']['footer'] = $EMAIL_TEMPLATE['default']['footer']; // will use default header above.
// ---------------------------------
// A Dummy Example for theme developers.
$EMAIL_TEMPLATE['example']['subject'] = '{SITENAME}: {SUBJECT} ';
$EMAIL_TEMPLATE['example']['header'] = $EMAIL_TEMPLATE['default']['header']; // will use default header above.
$EMAIL_TEMPLATE['example']['body'] = $EMAIL_TEMPLATE['default']['body']; // will use default header above.
$EMAIL_TEMPLATE['example']['footer'] = "<br /><br />
<a href='{SITEURL}'><img src='{THEME}images/my-signature.png' alt='{SITENAME}' /></a>
</div>
</body>
</html>";
?>

3
e107_core/templates/usersettings_template.php
View File

@@ -255,8 +255,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
{USERNAME}
{LOGINNAME}
<h4>".LAN_USET_31."</h4>
<div class='form-group'>
<label for='loginname' class='col-sm-3 control-label'>".LAN_USER_60.req(!$pref['disable_emailcheck'])."</label>
<div class='col-sm-9'>