mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

PHP Warning Fixes.

Browse Source
This commit is contained in:
Cameron
2020-12-29 08:04:52 -08:00
parent baed9ec8e5
commit 75f595adb0
13 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/eurl.php
View File

@@ -359,7 +359,7 @@ class eurl_admin_ui extends e_admin_controller_ui
$admin = $obj->admin(); $admin = $obj->admin();
$labels = vartrue($admin['labels'], array()); $labels = vartrue($admin['labels'], array());
$this->prefs['url_main_module']['writeParms'][$module] = vartrue($section['name'], eHelper::labelize($module)); $this->prefs['url_main_module']['writeParms'][$module] = eHelper::labelize($module); // vartrue($section['name'], eHelper::labelize($module));
} }
ksort($this->prefs['url_main_module']['writeParms']); ksort($this->prefs['url_main_module']['writeParms']);
@@ -882,7 +882,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
} }
*/ */
$selected = varset($obj->current[$module]) == $location ? "selected='selected'" : ''; $selected = varset($obj->current[$module]) == $location ? "selected='selected'" : '';
$opt .= "<option value='{$location}' {$selected} >".$diz.": ".$exampleUrl[0]."</option>"; $opt .= "<option value='{$location}' {$selected} >".$diz.": ".varset($exampleUrl[0])."</option>";
$info .= "<tr><td>".$label." $info .= "<tr><td>".$label."
@@ -909,10 +909,10 @@ class eurl_admin_form_ui extends e_admin_form_ui
<td><select name='eurl_config[$module]' class='form-control input-block-level'>".$opt."</select></td> <td><select name='eurl_config[$module]' class='form-control input-block-level'>".$opt."</select></td>
<td>"; <td>";
$bTable = ($admin['generate']['table']); $bTable = varset($admin['generate']['table']);
$bInput = $admin['generate']['input']; $bInput = varset($admin['generate']['input']);
$bOutput = $admin['generate']['output']; $bOutput = varset($admin['generate']['output']);
$bPrimary = $admin['generate']['primary']; $bPrimary = varset($admin['generate']['primary']);
$text .= (is_array($admin['generate'])) ? $frm->admin_button('rebuild['.$bTable.']', $bPrimary."::".$bInput."::".$bOutput,'delete', LAN_EURL_REBUILD) : ""; $text .= (is_array($admin['generate'])) ? $frm->admin_button('rebuild['.$bTable.']', $bPrimary."::".$bInput."::".$bOutput,'delete', LAN_EURL_REBUILD) : "";

2
e107_admin/frontpage.php
View File

@@ -147,7 +147,7 @@ elseif(isset($_POST['fp_dec']))
} }
*/ */
if (isset($_POST)) if (!empty($_POST))
{ {
// avoid endless loop. // avoid endless loop.

12
e107_admin/meta.php
View File

@@ -73,6 +73,7 @@ $meta_copyright = vartrue($pref['meta_copyright'], array());
$meta_author = vartrue($pref['meta_author'], array()); $meta_author = vartrue($pref['meta_author'], array());
$text = " $text = "
<form method='post' action='".e_SELF."' id='dataform'> <form method='post' action='".e_SELF."' id='dataform'>
<fieldset id='core-meta-settings'> <fieldset id='core-meta-settings'>
@@ -86,32 +87,32 @@ $text = "
<tr> <tr>
<td>".LAN_DESCRIPTION."</td> <td>".LAN_DESCRIPTION."</td>
<td>"; <td>";
$text .= $frm->textarea('meta_description',$tp->toForm($meta_diz[e_LANGUAGE]),3,80, array('size'=>'xxlarge')); $text .= $frm->textarea('meta_description',$tp->toForm(varset($meta_diz[e_LANGUAGE])),3,80, array('size'=>'xxlarge'));
// $text .= "<textarea class='tbox textarea e-autoheight' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm(varset($meta_diz[e_LANGUAGE]))."</textarea>"; // $text .= "<textarea class='tbox textarea e-autoheight' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm(varset($meta_diz[e_LANGUAGE]))."</textarea>";
$text .= "</td> $text .= "</td>
</tr> </tr>
<tr> <tr>
<td>".LAN_KEYWORDS."</td> <td>".LAN_KEYWORDS."</td>
<td>"; <td>";
$text .= $frm->tags('meta_keywords',$tp->toForm($meta_keywords[e_LANGUAGE])); $text .= $frm->tags('meta_keywords',$tp->toForm(varset($meta_keywords[e_LANGUAGE])));
// $text .= "<textarea class='tbox textarea e-autoheight' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm(varset($meta_keywords[e_LANGUAGE]))."</textarea>"; // $text .= "<textarea class='tbox textarea e-autoheight' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm(varset($meta_keywords[e_LANGUAGE]))."</textarea>";
$text .= "</td> $text .= "</td>
</tr> </tr>
<tr> <tr>
<td>".LAN_COPYRIGHT."</td> <td>".LAN_COPYRIGHT."</td>
<td><input class='tbox form-control input-xxlarge' size='70' type='text' name='meta_copyright' value=\"".$meta_copyright[e_LANGUAGE]."\" /></td> <td><input class='tbox form-control input-xxlarge' size='70' type='text' name='meta_copyright' value=\"".varset($meta_copyright[e_LANGUAGE])."\" /></td>
</tr> </tr>
<tr> <tr>
<td>".LAN_AUTHOR."</td> <td>".LAN_AUTHOR."</td>
<td><input class='tbox form-control input-xxlarge' size='70' type='text' name='meta_author' value=\"".$meta_author[e_LANGUAGE]."\" /></td> <td><input class='tbox form-control input-xxlarge' size='70' type='text' name='meta_author' value=\"".varset($meta_author[e_LANGUAGE])."\" /></td>
</tr> </tr>
<tr> <tr>
<td>".METLAN_1."</td> <td>".METLAN_1."</td>
<td>"; <td>";
$text .= $frm->textarea('meta',str_replace("<","&lt;",$tp->toForm($meta[e_LANGUAGE])),5,100,'size=block-level'); $text .= $frm->textarea('meta',str_replace("<","&lt;",$tp->toForm(varset($meta[e_LANGUAGE]))),5,100,'size=block-level');
$text .= "<span class='field-help'>".METLAN_2."</span>"; $text .= "<span class='field-help'>".METLAN_2."</span>";
@@ -141,4 +142,3 @@ $ns->tablerender(METLAN_00." (".e_LANGUAGE.")", $mes->render().$text);
require_once("footer.php"); require_once("footer.php");
?>

8
e107_admin/theme.php
View File

@@ -831,7 +831,7 @@ class theme_admin_online_tree_model extends e_tree_model
'thumbnail' => $r['thumbnail'], 'thumbnail' => $r['thumbnail'],
'url' => $r['urlView'], 'url' => $r['urlView'],
'author' => $r['author'], 'author' => $r['author'],
'website' => $r['authorUrl'], 'website' => varset($r['authorUrl']),
'compatibility' => $r['compatibility'], 'compatibility' => $r['compatibility'],
'description' => $r['description'], 'description' => $r['description'],
'price' => $r['price'], 'price' => $r['price'],
@@ -958,6 +958,8 @@ class theme_admin_form_ui extends e_admin_form_ui
$version = $tp->filter(e_VERSION,'version'); $version = $tp->filter(e_VERSION,'version');
$compat = $tp->filter($theme['compatibility'], 'version'); $compat = $tp->filter($theme['compatibility'], 'version');
$disabled = ''; $disabled = '';
$mainTitle = TPVLAN_10; $mainTitle = TPVLAN_10;
@@ -1066,8 +1068,10 @@ class theme_builder extends e_admin_ui
e107::getMessage()->addDebug("Disable debug to save generated files. "); e107::getMessage()->addDebug("Disable debug to save generated files. ");
if(!empty($_GET['newtheme']))
{
$this->themeName = $tp->filter($_GET['newtheme'],'w'); $this->themeName = $tp->filter($_GET['newtheme'],'w');
}
if(!empty($_GET['src'])) if(!empty($_GET['src']))
{ {

2
e107_handlers/form_handler.php
View File

@@ -7079,7 +7079,7 @@ var_dump($select_options);*/
{ {
$key = strtoupper($k); $key = strtoupper($k);
$fields[$v]['grid'] = true; $fields[$v]['grid'] = true;
$vars[$key] = $this->renderValue($v,$data[$v],$fields[$v],$id); $vars[$key] = $this->renderValue($v, varset($data[$v]), $fields[$v], $id);
} }
$cells[] = "<div class='".$cls." admin-ui-grid'>". $tp->simpleParse($template,$vars). '</div>'; $cells[] = "<div class='".$cls." admin-ui-grid'>". $tp->simpleParse($template,$vars). '</div>';

9
e107_handlers/library_manager.php
View File

@@ -984,17 +984,18 @@ class e_library_manager
$library['installed'] = false; $library['installed'] = false;
// Check whether the library exists. // Check whether the library exists.
if(!isset($library['library_path'])) if(!isset($library['library_path']) && !empty($library['machine_name']))
{ {
$library['library_path'] = $this->detectPath($library['machine_name']); $library['library_path'] = $this->detectPath($library['machine_name']);
} }
$libraryPath = e107::getParser()->replaceConstants($library['library_path']); $libraryPath = !empty($library['library_path']) ? e107::getParser()->replaceConstants($library['library_path']) : '';
if($library['library_path'] === false || (!file_exists($libraryPath) && substr($libraryPath, 0, 4) != 'http'))
if(empty($library['library_path']) || (!empty($libraryPath) && !file_exists($libraryPath) && substr($libraryPath, 0, 4) != 'http'))
{ {
$library['error'] = LAN_NOT_FOUND; $library['error'] = LAN_NOT_FOUND;
$replace_with = array($library['name']); $replace_with = array($name);
$library['error_message'] = e107::getParser()->lanVars(LAN_LIBRARY_MANAGER_03, $replace_with, true); $library['error_message'] = e107::getParser()->lanVars(LAN_LIBRARY_MANAGER_03, $replace_with, true);
return $library; return $library;

2
e107_handlers/mailout_admin_class.php
View File

@@ -2248,7 +2248,7 @@ class mailoutAdminClass extends e107MailManager
$text .= "<tr> $text .= "<tr>
<td><label for='smtp_keepalive'>" . LAN_MAILOUT_57 . "</label></td><td>\n"; <td><label for='smtp_keepalive'>" . LAN_MAILOUT_57 . "</label></td><td>\n";
$text .= $frm->radio_switch('smtp_keepalive', $pref['smtp_keepalive']) . " $text .= $frm->radio_switch('smtp_keepalive', varset($pref['smtp_keepalive'])) . "
</td> </td>
</tr>"; </tr>";

2
e107_handlers/sitelinks_class.php
View File

@@ -1397,7 +1397,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
//XXX && !is_numeric($act) ??? //XXX && !is_numeric($act) ???
if (($active_page == (string) $act) if (($active_page == (string) $act)
|| (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act)) || (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act))
|| e_REQUEST_HTTP === $e107_vars[$act]['link'] || e_REQUEST_HTTP === varset($e107_vars[$act]['link'])
) )
{ {
$temp = $tmpl['button_active'.$kpost]; $temp = $tmpl['button_active'.$kpost];

1
e107_handlers/theme_handler.php
View File

@@ -830,6 +830,7 @@ class e_theme
// print_a($lays); // print_a($lays);
$themeArray['legacy'] = true; $themeArray['legacy'] = true;
$themeArray['html'] = false; $themeArray['html'] = false;
$themeArray['compatibility'] = '1';
return $themeArray; return $themeArray;
} }

29
e107_handlers/user_extended_class.php
View File

@@ -47,6 +47,33 @@ class e107_user_extended
public function __construct() public function __construct()
{ {
$constants = array(
'EUF_CATEGORY' => 0,
'EUF_TEXT' => 1,
'EUF_RADIO' => 2,
'EUF_DROPDOWN' => 3,
'EUF_DB_FIELD' => 4,
'EUF_TEXTAREA' => 5,
'EUF_INTEGER' => 6,
'EUF_DATE' => 7,
'EUF_LANGUAGE' => 8,
'EUF_PREDEFINED' => 9, // should be EUF_LIST IMO
'EUF_CHECKBOX' => 10,
'EUF_PREFIELD' => 11, // should be EUF_PREDEFINED => useful when creating fields from e.g. plugin XML
'EUF_ADDON' => 12, // defined within e_user.php addon @todo
'EUF_COUNTRY' => 13, // $frm->country()
'EUF_RICHTEXTAREA' => 14, // $frm->bbarea()
);
foreach($constants as $def => $val)
{
if(!defined($def))
{
define($def, $val);
}
}
/*
@define('EUF_CATEGORY', 0); @define('EUF_CATEGORY', 0);
@define('EUF_TEXT',1); @define('EUF_TEXT',1);
@define('EUF_RADIO',2); @define('EUF_RADIO',2);
@@ -61,7 +88,7 @@ class e107_user_extended
@define('EUF_PREFIELD',11); // should be EUF_PREDEFINED, useful when creating fields from e.g. plugin XML @define('EUF_PREFIELD',11); // should be EUF_PREDEFINED, useful when creating fields from e.g. plugin XML
@define('EUF_ADDON', 12); // defined within e_user.php addon @todo @define('EUF_ADDON', 12); // defined within e_user.php addon @todo
@define('EUF_COUNTRY', 13); // $frm->country() @define('EUF_COUNTRY', 13); // $frm->country()
@define('EUF_RICHTEXTAREA', 14); // $frm->bbarea() @define('EUF_RICHTEXTAREA', 14); // $frm->bbarea()*/
$this->typeArray = array( $this->typeArray = array(
'text' => EUF_TEXT, 'text' => EUF_TEXT,

3
e107_handlers/userclass_class.php
View File

@@ -469,7 +469,8 @@ class user_class
if(is_array($extra_js)) if(is_array($extra_js))
{ {
$options = $extra_js; $options = $extra_js;
unset($extra_js); $extra_js = '';
} }
$class = "tbox form-control"; $class = "tbox form-control";

2
e107_plugins/news/e_sitelink.php
View File

@@ -150,7 +150,7 @@ class news_sitelink // include plugin-folder in the name.
'link_order' => '', 'link_order' => '',
'link_parent' => '', 'link_parent' => '',
'link_open' => '', 'link_open' => '',
'link_class' => intval($row['news_class']) 'link_class' => 0
); );

2
e107_plugins/social/admin_config.php
View File

@@ -419,7 +419,7 @@ class social_ui extends e_admin_ui
<tr> <tr>
<td><label for='".$text_label."'>".LAN_SOCIAL_ADMIN_11." ".$var['label']." ".LAN_SOCIAL_ADMIN_12."</label></td> <td><label for='".$text_label."'>".LAN_SOCIAL_ADMIN_11." ".$var['label']." ".LAN_SOCIAL_ADMIN_12."</label></td>
<td> <td>
".$frm->text($keypref, $pref['xurl'][$k], false, $opts)." ".$frm->text($keypref, varset($pref['xurl'][$k]), false, $opts)."
<div class='field-help'>".LAN_SOCIAL_ADMIN_13." ".$var['label']." ".LAN_SOCIAL_ADMIN_12." (".$def.")</div> <div class='field-help'>".LAN_SOCIAL_ADMIN_13." ".$var['label']." ".LAN_SOCIAL_ADMIN_12." (".$def.")</div>
</td> </td>
</tr> </tr>