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

Minor fixes and sync with 0.7

Browse Source
This commit is contained in:
CaMer0n
2011-07-24 20:57:48 +00:00
parent 3f4dd7a25c
commit a6613cb515
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
e107_core/bbcodes/bb_youtube.php
View File

@@ -179,37 +179,38 @@ class bb_youtube extends e_bb_base
switch ($parms[0]) switch ($parms[0])
{ {
case 'tiny': case 'tiny':
$params['w'] = 200; $params['w'] = 320; // 200;
$params['h'] = 180; $params['h'] = 205; // 180;
break; break;
case 'small': case 'small':
$params['w'] = 445; $params['w'] = 560; // 445;
$params['h'] = 364; $params['h'] = 340; // 364;
break; break;
case 'medium': case 'medium':
$params['w'] = 500; $params['w'] = 640; // 500;
$params['h'] = 405; $params['h'] = 385; // 405;
break; break;
case 'big': case 'big':
$params['w'] = 660; case 'large':
$params['h'] = 525; $params['w'] = 853; // 660;
$params['h'] = 505; // 525;
break; break;
case 'huge': case 'huge':
$params['w'] = 980; $params['w'] = 1280; // 980;
$params['h'] = 765; $params['h'] = 745; // 765;
break; break;
default: default: // maximum 1920 x 1080 (+25)
$dim = explode(',', $parms[0], 2); $dim = explode(',', $dimensions, 2);
$params['w'] = (integer) varset($dim[0], 445); $params['w'] = (integer) varset($dim[0], 445);
if($params['w'] > 980 || $params['w'] < 200) $params['w'] = 445; if($params['w'] > 1920 || $params['w'] < 200) $params['w'] = 640;
$params['h'] = (integer) varset($dim[1], 364); $params['h'] = (integer) varset($dim[1], 364);
if($params['h'] > 765 || $params['h'] < 180) $params['h'] = 364; if($params['h'] > 1105 || $params['h'] < 137) $params['h'] = 385;
break; break;
} }

25
e107_plugins/faqs/faqs.php
View File

@@ -106,13 +106,13 @@ if (isset($_POST['commentsubmit']))
{ {
if(vartrue($faqpref['classic_look'])) if(vartrue($faqpref['classic_look']))
{ {
$tmp = $faq->show_existing_parents($action, $sub_action, $id, $from, $amount); $ftmp = $faq->show_existing_parents($action, $sub_action, $id, $from, $amount);
$caption = FAQLAN_41; $caption = FAQLAN_41;
} }
else else
{ {
$tmp = $faq->view_all(); $ftmp = $faq->view_all();
$caption = FAQLAN_FAQ; $caption = FAQLAN_FAQ;
} }
if (vartrue($faqpref['faq_title'])) if (vartrue($faqpref['faq_title']))
@@ -123,25 +123,28 @@ if (isset($_POST['commentsubmit']))
{ {
define("e_PAGETITLE", FAQLAN_23); define("e_PAGETITLE", FAQLAN_23);
} }
require_once (HEADERF); require_once (HEADERF);
$ns->tablerender($caption, $tmp['text']);
$ns->tablerender($caption, $ftmp['text']);
} }
if($action == "cat" && $idx) if($action == "cat" && $idx)
{ {
$tmp = $faq->view_faq($idx) ; $ftmp = $faq->view_faq($idx) ;
define("e_PAGETITLE",FAQLAN_FAQ." - ". $tmp['title']); define("e_PAGETITLE",FAQLAN_FAQ." - ". $ftmp['title']);
require_once(HEADERF); require_once(HEADERF);
$ns -> tablerender($tmp['caption'], $tmp['text']); $ns -> tablerender($ftmp['caption'], $ftmp['text']);
} }
if ($action == "cat") if ($action == "cat")
{ {
$tmp = $faq->view_cat_list($action, $id); $ftmp = $faq->view_cat_list($action, $id);
define("e_PAGETITLE", strip_tags($tmp['title'].$tmp['caption'])); define("e_PAGETITLE", strip_tags($ftmp['title'].$ftmp['caption']));
require_once (HEADERF); require_once (HEADERF);
$ns->tablerender($tmp['caption'], $tmp['text']); $ns->tablerender($ftmp['caption'], $ftmp['text']);
} }
@@ -172,6 +175,7 @@ class faq
{ {
$sql = e107::getDb(); $sql = e107::getDb();
$tp = e107::getParser(); $tp = e107::getParser();
$ret = array();
global $FAQ_START, $FAQ_END, $FAQ_LISTALL_START,$FAQ_LISTALL_LOOP,$FAQ_LISTALL_END; global $FAQ_START, $FAQ_END, $FAQ_LISTALL_START,$FAQ_LISTALL_LOOP,$FAQ_LISTALL_END;
@@ -206,6 +210,7 @@ class faq
$ret['title'] = FAQLAN_FAQ; $ret['title'] = FAQLAN_FAQ;
$ret['text'] = $text; $ret['text'] = $text;
$ret['caption'] = $caption; $ret['caption'] = $caption;
return $ret; return $ret;
} }

2
e107_plugins/links_page/link_class.php
View File

@@ -835,7 +835,7 @@ class linkclass
".$rs -> form_close()." ".$rs -> form_close()."
</div>"; </div>";
$ns->tablerender(LCLAN_ITEM_24, $text); $ns->tablerender(LCLAN_PAGETITLE_1, $text);
} }
function show_links() function show_links()