Merge

inside/ActionGroupRelationship.php

@@ -17,7 +17,7 @@ class ActionGroupRelationship {
     $this->__construct($action_id, $group_id);
   }
   public function __construct($action_id = NULL, $group_id = NULL){
-    $this->conn =& DB_connect();
+    $this->conn = db_connect();
 
     $this->action_id = $action_id;
     $this->group_id = $group_id;

inside/ActionGroupRelationships.php

@@ -9,13 +9,7 @@ class ActionGroupRelationships {
   }
   
   function __construct(){
-    $conn =& DB::connect(getDSN());
+      $this->conn = db_connect();
-    if (DB::isError($conn)){
-      error("ActionGroupRelationships: " . $conn->toString());
-      exit();
-    }else {
-      $this->conn = $conn;
-    }
   }    
      
   public function getJoinedList($group_id, $type = "array", $exclude = 1){
@@ -85,4 +79,4 @@ class ActionGroupRelationships {
   }
 
 }
-?>
+?>

inside/Actions.php

@@ -9,13 +9,7 @@ class Actions {
   }
 
   function __construct(){
-    $conn =& DB::connect(getDSN());
+    $this->conn = db_connect();
-    if (DB::isError($conn)){
-      error("Actions: " . $conn->toString());
-      exit();
-    }else {
-      $this->conn = $conn;
-    }
 
     $sql = "SELECT id, name  
             FROM din_action
@@ -53,4 +47,4 @@ class Actions {
   }
 
 }
-?>
+?>

inside/DocumentCategories.php

@@ -39,4 +39,4 @@ class DocumentCategories {
   }
 
 }
-?>
+?>

inside/Group.php

@@ -20,13 +20,7 @@ class Group {
   }
 
   public function __construct($id = NULL, $data = NULL){
-    $conn =& DB::connect(getDSN());
+    $this->conn = db_connect();
-    if (DB::isError($conn)){
-      print("error: ".$conn->toString());
-      exit();
-    }else {
-      $this->conn = $conn;
-    }
 
     $this->id = $id;
 
@@ -184,4 +178,4 @@ class Group {
 	}
 }
 
-?>
+?>

inside/Groups.php

@@ -9,13 +9,7 @@ class Groups {
   }
 
   function __construct($restriction = NULL){
-    $conn =& DB::connect(getDSN());
+    $this->conn = db_connect();
-    if (DB::isError($conn)){
-      error("Groups: " . $conn->toString());
-      exit();
-    }else {
-      $this->conn = $conn;
-    }
 
     if (!checkAuth("view-protected-users")){
       $condition = "AND id != 1";

inside/JobCategories.php

@@ -9,13 +9,7 @@ class JobCategories {
   }
 
   function __construct(){
-    $conn =& DB::connect(getDSN());
+    $this->conn = db_connect();
-    if (DB::isError($conn)){
-      error("JobCategories: " . $conn->toString());
-      exit();
-    }else {
-      $this->conn = $conn;
-    }
 
     $sql = "SELECT id, title FROM din_jobcategory";
     $result = $this->conn->query($sql);
@@ -44,4 +38,4 @@ class JobCategories {
     print("      </table>");
   }
 }
-?>
+?>

inside/UserGroupRelationships.php

@@ -9,13 +9,7 @@ class UserGroupRelationships {
   }
 
   function __construct(){
-    $conn =& DB::connect(getDSN());
+      $this->conn = db_connect();
-    if (DB::isError($conn)){
-      error("UserGroupRelationships: " . $conn->toString());
-      exit();
-    }else {
-      $this->conn = $conn;
-    }
   }    
      
   public function getJoinedList($group_id, $type = "array"){
@@ -76,4 +70,4 @@ class UserGroupRelationships {
   }
 
 }
-?>
+?>

inside/file.php

@@ -3,7 +3,7 @@
 require_once "includes.php";
 
 
-$conn =& DB_connect();
+$conn = db_connect();
 
 $id = $_GET['id'];
 

inside/membershipcard_db.php

@@ -3,10 +3,10 @@ header("Content-type: Text/plain");
 
 require_once "includes.php";
 
-$conn = & DB :: connect(getDSN());
+$conn = db_connect();
 if (DB :: isError($conn)) {
     print ("error: " . $conn->toString());
-    exit ();
+    exit();
 }
 
 $i = 0;
@@ -98,4 +98,4 @@ if (DB :: isError($result) != true) {
   }
 }
 
-print "\n\nInsert $i rows\nUpdated $u rows";
+print "\n\nInsert $i rows\nUpdated $u rows";