mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Notice removal, undefined forum shortcode

Browse Source
This commit is contained in:
e107steved
2007-05-17 20:15:04 +00:00
parent d27ad1867b
commit c3559b5729
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_admin/cpage.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $
| $Revision: 1.3 $
| $Date: 2007-03-23 20:39:52 $
| $Author: lisa_ $
| $Revision: 1.4 $
| $Date: 2007-05-17 20:14:57 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -36,7 +36,7 @@ if (e_QUERY)
$action = $tmp[0];
$sub_action = $tmp[1];
$id = $tmp[2];
$from = ($tmp[3] ? $tmp[3] : 0);
$from = varset($tmp[3],0);
}
if(isset($_POST['submitPage']))
@@ -127,12 +127,12 @@ class page
{
$text .= "
<tr>
<td style='width:5%; text-align: center;' class='forumheader3'>$pge[page_id]</td>
<td style='width:60%' class='forumheader3'><a href='".($pge[page_theme] ? e_ADMIN."menus.php" : e_BASE."page.php?{$pge[page_id]}" )."'>$pge[page_title]</a></td>
<td style='width:15%; text-align: center;' class='forumheader3'>".($pge[page_theme] ? "menu" : "page")."</td>
<td style='width:5%; text-align: center;' class='forumheader3'>{$pge['page_id']}</td>
<td style='width:60%' class='forumheader3'><a href='".($pge['page_theme'] ? e_ADMIN."menus.php" : e_BASE."page.php?{$pge['page_id']}" )."'>{$pge['page_title']}</a></td>
<td style='width:15%; text-align: center;' class='forumheader3'>".($pge['page_theme'] ? "menu" : "page")."</td>
<td style='width:20%; text-align: center;' class='forumheader3'>
<a href='".e_SELF."?".($pge[page_theme] ? "createm": "create").".edit.{$pge[page_id]}'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='delete[{$pge[page_id]}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".CUSLAN_4." [ ID: $pge[page_id] ]')\"/>
<a href='".e_SELF."?".($pge['page_theme'] ? "createm": "create").".edit.{$pge['page_id']}'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='delete[{$pge['page_id']}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".CUSLAN_4." [ ID: $pge[page_id] ]')\"/>
</td>
</tr>";
}
@@ -167,7 +167,7 @@ class page
global $sql, $tp, $ns, $pref, $sub_action, $id;
if ($sub_action == "edit" && !$_POST['preview'] && !$_POST['submit'])
if ($sub_action == "edit" && !isset($_POST['preview']) && !isset($_POST['submit']))
{
if ($sql->db_Select("page", "*", "page_id='$id' "))
{
@@ -187,6 +187,10 @@ class page
$row = $sql -> db_Fetch();
$page_link = $row['link_name'];
}
else
{
$page_link = '';
}
}
$text = "<div style='text-align:center'>
@@ -308,8 +312,8 @@ class page
$pauthor = ($_POST['page_display_authordate_flag'] ? USERID : 0);
if($mode)
{
$update = $sql -> db_Update("page", "page_title='$page_title', page_text='$page_text', page_author='$pauthor', page_rating_flag='".intval($_POST['page_rating_flag'])."', page_comment_flag='".intval($_POST['page_comment_flag'])."', page_password='".$_POST['page_password']."', page_class='".$_POST['page_class']."', page_ip_restrict='".$_POST['page_ip_restrict']."' WHERE page_id='$mode'");
{ // Don't think $_POST['page_ip_restrict'] is ever set
$update = $sql -> db_Update("page", "page_title='$page_title', page_text='$page_text', page_author='$pauthor', page_rating_flag='".intval($_POST['page_rating_flag'])."', page_comment_flag='".intval($_POST['page_comment_flag'])."', page_password='".$_POST['page_password']."', page_class='".$_POST['page_class']."', page_ip_restrict='".varset($_POST['page_ip_restrict'],'')."' WHERE page_id='$mode'");
$e107cache->clear("page_{$mode}");
$e107cache->clear("page-t_{$mode}");

8
e107_admin/header.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.9 $
| $Date: 2007-02-07 21:22:09 $
| $Revision: 1.10 $
| $Date: 2007-05-17 20:14:57 $
| $Author: e107steved $
+---------------------------------------------------------------+
*/
@@ -358,7 +358,7 @@ if (!function_exists('show_admin_menu')) {
}
$replace[0] = str_replace(" ", "&nbsp;", $e107_vars[$act]['text']);
$replace[1] = $e107_vars[$act]['link'];
if ($e107_vars[$act]['include']!='') {
if (!empty($e107_vars[$act]['include'])) {
$replace[2] = $e107_vars[$act]['include'];
} else {
$replace[2] = $js ? "onclick=\"showhideit('".$act."');\"" : "onclick=\"document.location='".$e107_vars[$act]['link']."'; disabled=true;\"";
@@ -458,4 +458,4 @@ if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
}
$sql->db_Mark_Time('(End: Parse Admin Header)');
}
?>
?>

44
e107_handlers/ren_help.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/ren_help.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:33:57 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-05-17 20:14:57 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -163,7 +163,7 @@ function Color_Select($formid='col_selector') {
}
}
}
document.write('<table cellspacing=\'1\' cellpadding=\'0\' style=\'cursor: hand; cursor: pointer; background-color: #000; width: 100%; border: 0px\'><tr>');
document.write('<table cellspacing=\'1\' cellpadding=\'0\' style=\'cursor: pointer; background-color: #000; width: 100%; border: 0px\'><tr>');
document.write(td_render(coloursgrey[0]) + tdblk + rows1 + rows2);
document.write('<\/tr><\/table>');
//]]>
@@ -282,25 +282,25 @@ function PreFile_Select($formid='prefile_selector',$bbcode_filedir) {
<option value=''>".LANHELP_43."</option>";
foreach($filelist as $file)
{
if(isset($file['class']))
{
$ucinfo = "^".$file['class'];
$ucname = r_userclass_name($file['class']);
}
else
{
$ucinfo = "";
$ucname = r_userclass_name(0);
}
if(isset($file['class']))
{
$ucinfo = "^".$file['class'];
$ucname = r_userclass_name($file['class']);
}
else
{
$ucinfo = "";
$ucname = r_userclass_name(0);
}
if($file['id'])
{
$text .= "<option value=\"[file={e_BASE}request.php?".$file['id']."{$cinfo}]".$file['name']."[/file]\">".$file['name']." - $ucname</option>\n";
}
else
{
$text .= "<option value=\"[file={e_BASE}request.php?".$file['url']."{$cinfo}]".$file['name']."[/file]\">".$file['name']." - $ucname</option>\n";
}
if($file['id'])
{
$text .= "<option value=\"[file={e_BASE}request.php?".$file['id']."{$ucinfo}]".$file['name']."[/file]\">".$file['name']." - {$ucname}</option>\n";
}
else
{
$text .= "<option value=\"[file={e_BASE}request.php?".$file['url']."{$ucinfo}]".$file['name']."[/file]\">".$file['name']." - {$ucname}</option>\n";
}
}
$text .="</select>";

5
e107_plugins/forum/forum_post_shortcodes.php
View File

@@ -17,6 +17,11 @@ $txt .= $tp->parseTemplate($LATESTPOSTS_END, TRUE, $forum_shortcodes);
return $txt;
SC_END
SC_BEGIN LATESTPOSTSCOUNT
return; // Null return as placeholder
SC_END
SC_BEGIN THREADTOPIC
global $thread_info, $action, $gen, $tp, $post_info, $forum_shortcodes, $THREADTOPIC_REPLY;
$post_info = $thread_info['head'];