Fixed msg->status not reporting the correct number of new messages

calendar/inc/footer.inc.php

@@ -13,7 +13,7 @@
 
   if (isset($friendly) && $friendly){
      $phpgw->common->phpgw_footer();
-     exit;
+     $phpgw->common->phpgw_exit();
   }
 
   if (!isset($phpgw_info["flags"]["nocalendarheader"]) ||

calendar/preferences.php

@@ -31,7 +31,7 @@
      $phpgw->preferences->commit();
      
      Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/preferences/index.php"));
-     exit;
+     $phpgw->common->phpgw_exit();
   }
 
   $phpgw->common->phpgw_header();

calendar/search.php

@@ -30,7 +30,7 @@
     echo "<b>".lang("Error").":</b>";
     echo lang("You must enter one or more search keywords.");
     $phpgw->common->phpgw_footer();
-    exit;
+    $phpgw->common->phpgw_exit();
   }
   $matches = 0;
 
@@ -97,7 +97,7 @@
     echo "<b>".lang("Error").":</b>";
     echo $error;
     $phpgw->common->phpgw_footer();
-    exit;
+    $phpgw->common->phpgw_exit();
   }
 
   $phpgw->template->set_file(array("search_t"	 => "search.tpl",

calendar/view.php

@@ -18,7 +18,7 @@
 
   if ($id < 1) {
      echo lang("Invalid entry id.");
-     exit;
+     $phpgw->common->phpgw_exit();
   }
 
   function add_day(&$repeat_days,$day) {

phpgwapi/inc/phpgw_common.inc.php

@@ -43,15 +43,6 @@
                                                        'gdm'      => True,
                                                        'named'    => True);
 
-  // This function is used if the developer wants to stop a running app in the middle of execution
-  // We may need to do some clean up before hand
-  function phpgw_exit()
-  {
-     global $phpgw;
-     
-     $phpgw->db->disconnect();
-     exit;
-  }
 
   // I had to create this has a wrapper, becuase the phpgw.inc.php files needs it before the classes
   // are finished loading (jengo)
@@ -104,6 +95,16 @@
    	return $ds;
     }
 
+    // This function is used if the developer wants to stop a running app in the middle of execution
+    // We may need to do some clean up before hand
+    function phpgw_exit()
+    {
+       global $phpgw;
+       
+       $phpgw->db->disconnect();
+       exit;
+    }
+
     function randomstring($size)
     {
       $s = "";

preferences/changepassword.php

@@ -19,7 +19,7 @@
 
   if (!$phpgw->acl->check("changepassword", 1)){
     Header("Location: index.php");
-    exit;
+    $phpgw->common->phpgw_exit();
   }    
 
   if (! $submit) {
@@ -70,7 +70,7 @@
    if ($error) {
       $phpgw->common->navbar();
       echo "<p><br>$error</p>";
-      exit;
+      $phpgw->common->phpgw_exit();
    }
 
    if ($phpgw_info["server"]["auth_type"] == "sql") {
@@ -83,7 +83,7 @@
 
       if (! @ldap_bind($ldap, $phpgw_info["server"]["ldap_root_dn"], $phpgw_info["server"]["ldap_root_pw"])) {
          echo "<p><b>Error binding to LDAP server.  Check your config</b>";
-         exit;
+         $phpgw->common->phpgw_exit();
       }
 
       $entry["userpassword"] = $phpgw->common->encrypt_password($n_passwd);

preferences/changeprofile.php

@@ -20,7 +20,7 @@
   include("../header.inc.php");
   if ($phpgw_info["user"]["permissions"]["anonymous"]) {
      Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/"));
-     exit;
+     $phpgw->common->phpgw_exit();
   }
 
   if ($submit) {

preferences/changetheme.php

@@ -25,7 +25,7 @@
      } else {
         Header("Location: " . $phpgw->link("changetheme.php"));
      }
-     exit;
+     $phpgw->common->phpgw_exit();
   }
 
   $dh = opendir($phpgw_info["server"]["server_root"] . "/phpgwapi/themes");

preferences/settings.php

@@ -218,7 +218,7 @@
 
      if ($phpgw_info["server"]["useframes"] != "never") {
         Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php"));
-        exit;
+        $phpgw->common->phpgw_exit();
      }
 
      Header("Location: " . $phpgw->link("index.php"));