From: <ada...@us...> - 2003-07-10 20:29:43
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory sc8-pr-cvs1:/tmp/cvs-serv20543/class Modified Files: Article.php Log Message: Fixed bad deletion URL & got rid of some double-quotes. Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Article.php 9 Jul 2003 20:24:24 -0000 1.1 --- Article.php 10 Jul 2003 18:12:05 -0000 1.2 *************** *** 347,351 **** /* if user can delete articles or can delete this article... */ if ($_SESSION['SES_ART_master']->can('delete',$this->created_username)) ! $article_tags['DELETE'] = '[<a href="index.php?module=article&edit=delete:' . $this->id.'" target="_blank">'.$_SESSION['translate']->it('Delete').' </a>]'; --- 347,351 ---- /* if user can delete articles or can delete this article... */ if ($_SESSION['SES_ART_master']->can('delete',$this->created_username)) ! $article_tags['DELETE'] = '[<a href="index.php?module=article&edit=delete&ARTICLE_id=' . $this->id.'" target="_blank">'.$_SESSION['translate']->it('Delete').' </a>]'; *************** *** 803,807 **** /* Delete references to this article in the menu */ ! $result = $GLOBALS['core']->getAll("SELECT menu_item_id,menu_item_url FROM mod_menuman_items WHERE menu_item_url = './index.php?module=article&view=".$this->id."'", true); if(!is_array($result)) echo "NO MENU RECORDS FOUND!"; --- 803,807 ---- /* Delete references to this article in the menu */ ! $result = $GLOBALS['core']->getAll('SELECT menu_item_id,menu_item_url FROM mod_menuman_items WHERE menu_item_url = "./index.php?module=article&view='.$this->id.'"', true); if(!is_array($result)) echo "NO MENU RECORDS FOUND!"; *************** *** 810,858 **** foreach($result as $value) { ! $children = $GLOBALS['core']->getAll("SELECT menu_item_id FROM mod_menuman_items WHERE menu_item_pid='" ! .$value['menu_item_id']."' and menu_item_id != '".$value['menu_item_id']."'", true); /* If this menu item has children, just point it to nowhere */ if(is_array($children)) { $isParent = TRUE; ! $GLOBALS['core']->query("UPDATE mod_menuman_items SET menu_item_url='./index.php?module=article' WHERE menu_item_id=".$value['menu_item_id'], true); } /* otherwise, delete it */ else ! $GLOBALS['core']->sqlDelete("mod_menuman_items", "menu_item_id", $item['menu_item_id']); } unset($_SESSION['OBJ_menuman']); } ! $title = "<div class=\"errortext\">".$_SESSION['translate']->it("Article Deleted")."!</div>"; ! $content = $_SESSION['translate']->it("The [var1] <b>[var2]</b> has successfully been [var3]" , $_SESSION['translate']->it('article') , $this->title ! , "<b>".$_SESSION['translate']->it("deleted")."</b>!") ! . "<br /><br />"; if (isset($isParent)) ! $content .= $_SESSION['translate']->it("Some menu links could not be removed") . "."; else ! $content .= $_SESSION['translate']->it("All menu links removed") . "."; $_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article'); } else if(isset($_POST['no'])) { ! $title = $_SESSION['translate']->it("Article Kept")."!"; ! $content = $_SESSION['translate']->it("The [var1] <b>[var2]</b> has successfully been [var3]" ! , $_SESSION['translate']->it('article'), $this->title, "<b>".$_SESSION['translate']->it("kept")."</b>!"); $_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article'); } else { ! $title = "<div class=\"errortext\">".$_SESSION['translate']->it("Confirm Action")."!</div>"; ! $content = $_SESSION['translate']->it('Are you sure you want to [var1] "[var2]"?' ! , '<b>'.$_SESSION['translate']->it('delete').'</b>', '<b><u>$this->title</u></b><br /><br />'); $myform[0] = $GLOBALS['core']->formHidden('module', 'article'); ! $myform[0] .= $GLOBALS['core']->formHidden("ARTICLE_id", $this->id); ! $myform[0] .= $GLOBALS['core']->formHidden("MASTER_op", "Delete"); ! $myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Yes'), "yes") . " "; ! $myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('No'), "no"); $content .= $GLOBALS['core']->makeForm("ARTICLE_confirm_delete", "index.php", $myform, "post", 0, 0); --- 810,858 ---- foreach($result as $value) { ! $children = $GLOBALS['core']->getAll('SELECT menu_item_id FROM mod_menuman_items WHERE menu_item_pid=' ! .$value['menu_item_id'].' and menu_item_id !='.$value['menu_item_id'], true); /* If this menu item has children, just point it to nowhere */ if(is_array($children)) { $isParent = TRUE; ! $GLOBALS['core']->query('UPDATE mod_menuman_items SET menu_item_url="./index.php?module=article" WHERE menu_item_id='.$value['menu_item_id'], true); } /* otherwise, delete it */ else ! $GLOBALS['core']->sqlDelete('mod_menuman_items', 'menu_item_id', $item['menu_item_id']); } unset($_SESSION['OBJ_menuman']); } ! $title = '<div class="errortext">'.$_SESSION['translate']->it('Article Deleted').'!</div>'; ! $content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]' , $_SESSION['translate']->it('article') , $this->title ! , '<b>'.$_SESSION['translate']->it('deleted').'</b>!') ! . '<br /><br />'; if (isset($isParent)) ! $content .= $_SESSION['translate']->it('Some menu links could not be removed') . '.'; else ! $content .= $_SESSION['translate']->it('All menu links removed') . '.'; $_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article'); } else if(isset($_POST['no'])) { ! $title = '<div class="errortext">'.$_SESSION['translate']->it('Article Kept').'!</div>'; ! $content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]' ! , $_SESSION['translate']->it('article'), $this->title, '<b>'.$_SESSION['translate']->it('kept').'</b>!'); $_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article'); } else { ! $title = '<div class="errortext">'.$_SESSION['translate']->it('Confirm Action').'!</div>'; ! $content = $_SESSION['translate']->it('Are you sure you want to <b>[var1] "[var2]"</b>?' ! , $_SESSION['translate']->it('delete'), $this->title); $myform[0] = $GLOBALS['core']->formHidden('module', 'article'); ! $myform[0] .= $GLOBALS['core']->formHidden('ARTICLE_id', $this->id); ! $myform[0] .= $GLOBALS['core']->formHidden('edit', 'delete'); ! $myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Yes'), 'yes') . ' '; ! $myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('No'), 'no'); $content .= $GLOBALS['core']->makeForm("ARTICLE_confirm_delete", "index.php", $myform, "post", 0, 0); |