[phpws-comm-commits] modules/contacts/class Country.php,1.2,1.3 Manager.php,1.2,1.3

[<dts...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/contacts/class
In directory sc8-pr-cvs1:/tmp/cvs-serv3482/class

Modified Files:
	Country.php Manager.php 
Log Message:
Progress!


Index: Country.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/contacts/class/Country.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Country.php	28 May 2003 18:37:14 -0000	1.2
--- Country.php	28 May 2003 20:34:52 -0000	1.3
***************
*** 32,36 ****
  
          if(isset($COUNTRY_ID)) {
!             $this->setId($MESSAGE_ID);
              $this->init();
          }
--- 32,36 ----
  
          if(isset($COUNTRY_ID)) {
!             $this->setId($COUNTRY_ID);
              $this->init();
          }
***************
*** 80,84 ****
  
      function _save() {
!         if(!$_SESSION["OBJ_user"]->allow_access("contacts", "edit_contacts")) {
              $message = $_SESSION["translate"]->it("Access to save country was denied due to lack of proper permissions.");
              $error = new PHWPS_Error("contacts", "CONTACTS_Country::_save()", $message, "exit", 1);
--- 80,84 ----
  
      function _save() {
!         if(!$_SESSION["OBJ_user"]->allow_access("contacts", "edit_countries")) {
              $message = $_SESSION["translate"]->it("Access to save country was denied due to lack of proper permissions.");
              $error = new PHWPS_Error("contacts", "CONTACTS_Country::_save()", $message, "exit", 1);
***************
*** 113,116 ****
--- 113,158 ----
  
  
+     function _delete() {
+         if(!$_SESSION["OBJ_user"]->allow_access("contacts", "delete_countries")) {
+             $message = $_SESSION["translate"]->it("Access to delete country was denied due to lack of proper permissions.");
+             $error = new PHWPS_Error("contacts", "CONTACTS_Country::_delete()", $message, "exit", 1);
+             $error->message();
+             return FALSE;
+         }
+ 
+         if(isset($_REQUEST["Country_yes"])) {
+             $this->kill();
+             $message = $_SESSION["translate"]->it("The country [var1] was successfully deleted from the database.", "<b><i>" . $this->getLabel() . "</i></b>");
+             $_SESSION["CONTACTS_Manager"]->message = new PHPWS_Message($message, "CNT_contacts");
+             $_REQUEST["CONTACTS_MAN_OP"] = "listcountries";
+             $_SESSION["CONTACTS_Manager"]->action();
+ 
+         } elseif(isset($_REQUEST["Country_no"])) {
+             $message = $_SESSION["translate"]->it("No country was deleted fromt he database.");
+             $_SESSION["CONTACTS_Manager"]->message = new PHPWS_Message($message, "CNT_contacts");
+             $_REQUEST["CONTACTS_MAN_OP"] = "listcountries";
+             $_REQUEST["CONTACTS_Manager"]->action();
+ 
+         } else {
+             $title = $_SESSION["translate"]->it("Delete Country Confirmation");
+ 
+             $form = new EZform("CONTACTS_Country_delete");
+             $form->add("module", "hidden", "contacts");
+             $form->add("CONTACTS_Country_OP", "hidden", "delete");
+ 
+             $form->add("Country_yes", "submit", $_SESSION["translate"]->it("Yes"));
+             $form->add("Country_no", "submit", $_SESSION["translate"]->it("No"));
+ 
+             $tags = array();
+             $tags = $form->getTemplate();
+             $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this country?");
+             
+             $content = $GLOBALS["core"]->processTemplate($tags, "contacts", "delete_country.tpl");
+             $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_contacts");
+         }
+ 
+     }// END FUNC _delete
+ 
+ 
      function action() {
          switch($_REQUEST["CONTACTS_Country_OP"]) {
***************
*** 125,128 ****
--- 167,174 ----
              case "save":
                  $this->_save();
+                 break;
+ 
+             case "delete":
+                 $this->_delete();
                  break;
  

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/contacts/class/Manager.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Manager.php	28 May 2003 18:37:14 -0000	1.2
--- Manager.php	28 May 2003 20:34:52 -0000	1.3
***************
*** 12,15 ****
--- 12,17 ----
      var $addresstype    = NULL;
  
+     var $message        = NULL;
+ 
      function CONTACTS_Manager() {
          $this->setModule("contacts");
***************
*** 88,92 ****
--- 90,109 ----
  
  
+     function _editCountry() {
+         $this->country = new CONTACTS_Country($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["CONTACTS_Country_OP"] = "edit";
+     }// END FUNC _editCountry
+ 
+ 
+     function _deleteCountries() {
+         $this->country = new CONTACTS_Country($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["CONTACTS_Country_OP"] = "delete";
+     }// END FUNC _editCountry
+ 
+ 
      function action() {
+         if(PHPWS_Message::isMessage($this->message))
+             $this->message->display();
+ 
          switch($_REQUEST["CONTACTS_MAN_OP"]) {
              case "new":
***************
*** 94,101 ****
                  break;
  
-             case "newcountry":
-                 $this->_newCountry();
-                 break;
- 
              case "view":
                  $this->_view();
--- 111,114 ----
***************
*** 106,111 ****
                  break;
  
              case "editcountries":
!                 $this->_editCountries();
                  break;
  
--- 119,132 ----
                  break;
  
+             case "newcountry":
+                 $this->_newCountry();
+                 break;
+ 
              case "editcountries":
!                 $this->_editCountry();
!                 break;
! 
!             case "deletecountries":
!                 $this->_deleteCountries();
                  break;