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

Category fix.

Browse Source
This commit is contained in:
CaMer0n
2011-06-17 05:45:22 +00:00
parent 0c1ed5165f
commit 78de8925fb
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
e107_admin/newspost.php
View File

@@ -528,8 +528,7 @@ class admin_newspost
switch ($delete) { switch ($delete) {
case 'main': case 'main':
//clear rewrite cache
if ($e107->sql->db_Count('news','(*)',"WHERE news_id={$del_id}")) if ($e107->sql->db_Count('news','(*)',"WHERE news_id={$del_id}"))
{ {
e107::getEvent()->trigger("newsdel", $del_id); e107::getEvent()->trigger("newsdel", $del_id);
@@ -548,7 +547,7 @@ class admin_newspost
break; break;
case 'category': case 'category':
//clear rewrite cache
if(!getperms('0|7')) $this->noPermissions(); if(!getperms('0|7')) $this->noPermissions();
@@ -689,10 +688,10 @@ class admin_newspost
$this->error = true; $this->error = true;
} }
if(!empty($_POST['news_rewrite_string']) && preg_match('#[^\w\pL\-]#u', $_POST['news_rewrite_string'])) // if(!empty($_POST['news_rewrite_string']) && preg_match('#[^\w\pL\-]#u', $_POST['news_rewrite_string']))
{ {
$this->show_message('Validation Error: Bad value for Category friendly URL', E_MESSAGE_ERROR); // $this->show_message('Validation Error: Bad value for Category friendly URL', E_MESSAGE_ERROR);
$this->error = true; // $this->error = true;
} }
if (!$this->error) if (!$this->error)
@@ -2074,17 +2073,14 @@ class admin_newspost
$frm = e107::getForm(false, true); $frm = e107::getForm(false, true);
$category = array(); $category = array();
$category_rewrite = array();
if ($this->getSubAction() == "edit" && !isset($_POST['update_category'])) if ($this->getSubAction() == "edit" && !isset($_POST['update_category']))
{ {
if (e107::getDb()->db_Select("news_category", "*", "category_id=".$this->getId())) if (e107::getDb()->db_Select("news_category", "*", "category_id=".$this->getId()))
{ {
$category = e107::getDb()->db_Fetch(); $category = e107::getDb()->db_Fetch();
} }
if($category && e107::getDb()->db_Select('news_rewrite', '*', 'news_rewrite_source='.$this->getId().' AND news_rewrite_type=2'))
{
$category_rewrite = e107::getDb()->db_Fetch();
}
} }
if($this->error && (isset($_POST['update_category']) || isset($_POST['create_category']))) if($this->error && (isset($_POST['update_category']) || isset($_POST['create_category'])))
@@ -2122,14 +2118,19 @@ class admin_newspost
".$frm->text('category_name', $category['category_name'], 200)." ".$frm->text('category_name', $category['category_name'], 200)."
<div class='field-help'>Required field</div> <div class='field-help'>Required field</div>
</td> </td>
</tr> </tr>";
<tr>
<td class='label'>Category friendly URL string</td> // Disabled until e_url is complete.
<td class='control'> // $text .= "
".$frm->text('news_rewrite_string', varset($category_rewrite['news_rewrite_string']), 255)." // <tr>
<div class='field-help'>To make this work, you need to enable 'SEF URLs' config profile from <a href='".e_ADMIN_ABS."eurl.php'>URL Configuration area</a></div> // <td class='label'>Category friendly URL string</td>
</td> // <td class='control'>
</tr> // ".$frm->text('category_sefurl', $category['category_sefurl'], 255)."
// <div class='field-help'></div>
// </td>
// </tr>";
$text .= "
<tr> <tr>
<td class='label'>Category meta keywords</td> <td class='label'>Category meta keywords</td>
<td class='control'> <td class='control'>
@@ -2156,7 +2157,7 @@ class admin_newspost
<td class='control'> <td class='control'>
".$frm->iconpicker('category_icon', $category['category_icon'], NWSLAN_54)." ".$frm->iconpicker('category_icon', $category['category_icon'], NWSLAN_54)."
".$frm->hidden('category_order', $category['category_order'])." ".$frm->hidden('category_order', $category['category_order'])."
".$frm->hidden('news_rewrite_id', $category_rewrite['news_rewrite_id'])."
</td> </td>
</tr> </tr>
</tbody> </tbody>
@@ -2227,7 +2228,7 @@ class admin_newspost
</thead> </thead>
<tbody> <tbody>
"; ";
if ($category_total = e107::getDb()->db_Select_gen("SELECT ncat.*, nrewr.news_rewrite_string FROM #news_category AS ncat LEFT JOIN #news_rewrite AS nrewr ON ncat.category_id=nrewr.news_rewrite_source AND nrewr.news_rewrite_type=2 ORDER BY ncat.category_order ASC")) if ($category_total = e107::getDb()->db_Select_gen("SELECT ncat.* FROM #news_category AS ncat ORDER BY ncat.category_order ASC"))
{ {
$tindex = 100; $tindex = 100;
while ($category = e107::getDb()->db_Fetch()) { while ($category = e107::getDb()->db_Fetch()) {
@@ -2239,7 +2240,7 @@ class admin_newspost
$icon = "<img class='icon action' src='{$icon}' alt='' />"; $icon = "<img class='icon action' src='{$icon}' alt='' />";
} }
$sefstr = $category['news_rewrite_string'] ? "<br />SEF: <strong>{$category['news_rewrite_string']}</strong>" : ''; //$sefstr = $category['news_rewrite_string'] ? "<br />SEF: <strong>{$category['news_rewrite_string']}</strong>" : '';
$text .= " $text .= "
<tr> <tr>