Changeset 183

Timestamp:

01/02/07 21:53:01 (2 years ago)

Author:

syrus

Message:

ajout/edition du reseau d inscription

Files:

• wifidog/wifidog-auth/wifidog/classes/Network.php (modified) (3 diffs)
• wifidog/wifidog-auth/wifidog/classes/User.php (modified) (11 diffs)
• wifidog/wifidog-auth/wifidog/signup.php (modified) (3 diffs)

wifidog/wifidog-auth/wifidog/classes/Network.php

@@ -99 +99 @@
-    }
-
+
-    /** Get the default network
-     * @return a Network object, NEVER returns null.
@@ -114 +115 @@
-        return $retval;
-    }
+
+
+// to finish
+
+   public static function getNetworkNameById($id) {
+        $retval = null;
+        global $db;
+        if(empty ($id))
+        {
+                $retval = "";
+        }
+        else {
+                $sql =   "SELECT name FROM networks WHERE network_id = '$id' LIMIT 1";
+                $db->execSqlUniqueRes($sql, $network_row, false);
+                if ($network_row == null) {
+                        $retval = "";
+                }
+                else $retval = $network_row['name'];
+        }
+        return $retval;
+        
+   }
-
-    /** Get the current network for which the portal is displayed or to which a user is physically connected.
@@ -185 +208 @@
-            $selected_id = null;
-        }
+        global $db;
+        $additional_where = $db->escapeString($additional_where);
+        $sql = "SELECT network_id, name FROM networks WHERE 1=1 $additional_where ORDER BY is_default_network DESC";
+        $network_rows = null;
+        $db->execSql($sql, $network_rows, false);
+        if ($network_rows == null) {
+            throw new Exception(_("Network::getAllNetworks:  Fatal error: No networks in the database!"));
+        }
+
+        $number_of_networks = count($network_rows);
+        if ($number_of_networks > 1) {
+            $i = 0;
+            foreach ($network_rows as $network_row) {
+                $tab[$i][0] = $network_row['network_id'];
+                $tab[$i][1] = $network_row['name'];
+                $i ++;
+            }
+            $html .= FormSelectGenerator :: generateFromArray($tab, $selected_id, $name, null, false);
+
+        }
+        else {
+            foreach ($network_rows as $network_row) //iterates only once...
+                {
+                $html .= " $network_row[name] ";
+                $html .= "<input type='hidden' name='$name' value='".htmlspecialchars($network_row['network_id'], ENT_QUOTES, 'UTF-8')."'>";
+            }
+        }
+
+        return $html;
+    }
+
+   public static function getSelectNetworkByNameUI($user_prefix, $selected_id = null, $additional_where = null) {
+        $html = '';
+        $name = $user_prefix;
+        $html .= _("Network:")." \n";
+
-        global $db;
-        $additional_where = $db->escapeString($additional_where);

wifidog/wifidog-auth/wifidog/classes/User.php

@@ -215 +215 @@
-     * @return the newly created User object, or null if there was an error
-     */
-
+_id
-    {
-        global $db;
@@ -237 +237 @@
-        $token = User :: generateToken();
-
-
+_id
-
-        $object = new self($id);
@@ -746 +746 @@
-                if ($user_rows != null)
-                {
-
+// 
-                        if ($type_interface != "table") {
-                                $html .= _("User");
@@ -760 +760 @@
-                                $html .= FormSelectGenerator :: generateFromArray($tab, null, $name, null, false);
-                        } else {
-Users List
+Liste des utilisateurs
-                                $html .= "\t<span class='node_admin'>"._("Filter:")."<input type=\"text\" tabindex=\"1\" maxlength=\"40\" size=\"40\" id=\"nodes_list_filter\" name=\"nodes_list_filter\" /></span>\n\t<br/>\n";
-                                $html .= "\t<!--[if IE]><style type='text/css'>#user_list_div table.scrollable>tbody { height: 15px; }</style><![endif]-->\n";
@@ -767 +767 @@
-                                $html .= "\t<div id='node_list_div' class='node_admin tableContainer'>\n";
-                                $html .= "\t\t<table id='nodes_list' class='node_admin filterable scrollable sortable'>\n\n";
-User Name</th>\n\t\t\t\t\t<th>Account&nbsp;Status</th>\n\t\t\t\t\t<th>Register&nbsp;Date</th><th>Network
+"._("Username")."</th>\n\t\t\t\t\t<th>"._("Account Status")."</th>\n\t\t\t\t\t<th>"._("Registered On")."</th><th>"._("Network")."
-
-                                $i = 0;
@@ -773 +773 @@
-                                {
-                                        $account_status = $user_row['account_status'];
+                    $network_name = Network::getNetworkNameById($user_row['network']);
-                                        $href = GENERIC_OBJECT_ADMIN_ABS_HREF."?object_id={$user_row['user_id']}&object_class=User&action=edit";
-{$user_row['network']}
+$network_name
-                                }
-                                $html .= "\t\t\t</tbody>\n\t\t</table>\n";
@@ -923 +924 @@
-// todo: list networks here
-
-
+
+
+
+
+
+
-                }
-
@@ -930 +936 @@
-    }
-
+    public function getNetworkName()
+    {
+        return $this->mRow['network'];
+    }
+
-    public function setWebsite($website)
-    {
@@ -1001 +1012 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
-
-    public function processAdminUI()
@@ -1009 +1026 @@
-        $currentUser= self::getCurrentUser();
-        if($this==$currentUser || $this->getNetwork()->hasAdminAccess($currentUser))
-
+        
-    //username
-        $name = "user_".$this->getId()."_username";
@@ -1050 +1067 @@
-        $this->setAccountStatus($_REQUEST[$account]);
-
-
+
+
+
+
+
-    }
-

wifidog/wifidog-auth/wifidog/signup.php

@@ -58 +58 @@
-require_once('classes/MainUI.php');
-require_once('classes/Mail.php');
+require_once('classes/Network.php');
-
-/**
@@ -216 +217 @@
-
-    $network = Network::getObject($_REQUEST['auth_source']);
+    $network_node = Network::getCurrentNetwork();
-        
-    try {
@@ -270 +272 @@
-
-        // Create user and send him the validation email
-->getName
+_node->getId
-        $created_user->sendValidationEmail();
-