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

merging with upstream

Browse Source
This commit is contained in:
Deltik
2013-05-05 22:39:46 -05:00
parent cabc5e5487 c06a0471b2
commit 45ef27745b
20 changed files with 271 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_core/shortcodes/batch/contact_shortcodes.php
View File

@@ -90,7 +90,7 @@ class contact_shortcodes extends e_shortcode
function sc_contact_name($parm='')
{
return "<input type='text' id='contactName' title='Your full name' name='author_name' required='required' size='30' class='tbox' value=\"".varset($_POST['author_name'])."\" />";
return "<input type='text' style='max-width:99%' id='contactName' title='Your full name' name='author_name' required='required' size='30' class='tbox' value=\"".varset($_POST['author_name'])."\" />";
}
@@ -98,14 +98,14 @@ class contact_shortcodes extends e_shortcode
function sc_contact_email($parm='')
{
return "<input type='email' id='contactEmail' title='a valid email address' name='email_send' required='required' size='30' class='tbox' value='".(vartrue($_POST['email_send']) ? $_POST['email_send'] : USEREMAIL)."' />";
return "<input type='email' style='max-width:99%' id='contactEmail' title='a valid email address' name='email_send' required='required' size='30' class='tbox' value='".(vartrue($_POST['email_send']) ? $_POST['email_send'] : USEREMAIL)."' />";
}
function sc_contact_subject($parm='')
{
return "<input type='text' title='the subject of your enquiry' name='subject' required='required' size='30' class='tbox' value=\"".varset($_POST['subject'])."\" />";
return "<input type='text' style='max-width:99%' title='the subject of your enquiry' name='subject' required='required' size='30' class='tbox' value=\"".varset($_POST['subject'])."\" />";
}
@@ -120,7 +120,7 @@ class contact_shortcodes extends e_shortcode
$size = 'input-xxlarge';
}
return "<textarea cols='{$cols}' id='contactBody' rows='{$rows}' name='body' required='required' class='tbox {$size}'>".stripslashes(varset($_POST['body']))."</textarea>";
return "<textarea cols='{$cols}' style='max-width:99%' id='contactBody' rows='{$rows}' name='body' required='required' class='tbox {$size}'>".stripslashes(varset($_POST['body']))."</textarea>";
}

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

@@ -191,9 +191,10 @@ class usersettings_shortcodes extends e_shortcode
return;
}
parse_str($parm);
$cols = (isset($cols) ? $cols : 58);
$rows = (isset($rows) ? $rows : 4);
return "<textarea class='tbox signature' name='signature' cols='{$cols}' rows='{$rows}' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".$this->var['user_signature']."</textarea>";
//$cols = (isset($cols) ? $cols : 58);
//$rows = (isset($rows) ? $rows : 4);
//return "<textarea class='tbox signature' name='signature' cols='{$cols}' rows='{$rows}' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".$this->var['user_signature']."</textarea>";
return e107::getForm()->bbarea('signature', $this->var['user_signature'], '', '', 'small');
}

23
e107_core/shortcodes/single/sitelinks_alt.php
View File

@@ -21,7 +21,7 @@ class sitelinks_alt
$params = explode('+', $parm);
if (isset($params[0]) && $params[0] && $params[0] != 'no_icons' && $params[0] != 'default')
if (vartrue($params[0]) && ($params[0] != 'no_icons') && ($params[0] != 'default'))
{
$icon = $params[0];
}
@@ -58,6 +58,7 @@ class sitelinks_alt
foreach ($linklist['head_menu'] as $lk)
{
$lk['link_url'] = $tp->replaceConstants($lk['link_url'], TRUE, TRUE);
if ($params[0] == 'no_icons')
{
$link_icon = 'no_icons';
@@ -170,6 +171,8 @@ class sitelinks_alt
function render_sub($linklist, $id, $params, $icon)
{
$tp = e107::getParser();
$text = "<div id='l_".$id."' class='menu' onmouseover=\"menuMouseover(event)\">";
foreach ($linklist['sub_'.$id] as $sub)
{
@@ -193,12 +196,20 @@ class sitelinks_alt
}
else
{
$sub_icon = "<img src='";
$sub_icon .= ($sub['link_button']) ? e_IMAGE.'icons/'.$sub['link_button'] : $icon;
$sub_icon .= "' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />";
if(vartrue($sub['link_button']))
{
$icon_url = ($sub['link_button'][0] == "{") ? $tp->replaceConstants($sub['link_button'],'abs') : e_IMAGE_ABS.'icons/'.$sub['link_button'];
$sub_icon = "<img src='".$icon_url."' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />";
}
else
{
$sub_icon = '';
}
}
if (isset($linklist['sub_'.$sub['link_id']]))
{ // Has Children.
if (isset($linklist['sub_'.$sub['link_id']])) // Has Children.
{
$sub_ids[] = $sub['link_id'];
$text .= self::adnav_main($subname, $sub['link_url'], $sub_icon, 'l_'.$sub['link_id'], $params, $sub['link_open']);
}

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

@@ -1,6 +1,6 @@
<?php
// $Id$
function user_avatar_shortcode($parm='')
function user_avatar_shortcode($parm=null)
{
global $loop_uid;
@@ -27,7 +27,7 @@ function user_avatar_shortcode($parm='')
$image=$row['user_image'];
}
}
elseif($parm)
elseif(!is_null($parm))
{
$image=$parm;
}

7
e107_core/templates/usersettings_template.php
View File

@@ -15,7 +15,12 @@
*/
if (!defined('e107_INIT')) { exit; }
if (!defined("USER_WIDTH")){ define("USER_WIDTH", "width:auto"); }
if (!defined("USER_WIDTH"))
{
$uw = (deftrue('e_BOOTSTRAP')) ? "" : "width:97%";
define("USER_WIDTH", $uw);
}
// global $usersettings_shortcodes, $pref;