[Fixed quota check to work wiht openser 1.3
Adrian Georgescu <ag@ag-projects.com>**20080127214538
 Better html for enum ranges
 
] hunk ./phplib/local.inc 724
-            print " | <a href=rating_tables.phtml>Rating</a>";
-        }
-        
-        if ($perm->have_perm("statistics")) {
-            print " | <a href=status/sip_online.phtml target=siponline>Registrar</a>";
-            print " | <a href=status/media_sessions.phtml target=mediasessions>Sessions</a>";
-            print " | <a href=status/usage/index.phtml target=usage>Statistics</a>";
+            print " | <a href=rating_tables.phtml>Rating tables</a>";
hunk ./phplib/local.inc 728
-            print " | <a href=provisioning.phtml>NGNPro</a>";
+            print " | <a href=provisioning.phtml>SIP accounts</a>";
+        }
+
+        
+        if ($perm->have_perm("statistics")) {
+            print " | <a href=status/sip_online.phtml target=siponline>SIP registrar</a>";
+            print " | <a href=status/media_sessions.phtml target=mediasessions>RTP sessions</a>";
+            print " | <a href=status/usage/index.phtml target=usage>Usage</a>";
hunk ./phplib/local.inc 739
-        print " | <a href=accounts.phtml>Accounts</a>";
+        print " | <a href=accounts.phtml>Login accounts</a>";
hunk ./provisioning/ngnpro_client_lib.phtml 3350
-                              'info'        => array('type'=>'string'),
-                              'size'        => array('type'=>'integer'),
-                              'ttl'         => array('type'=>'integer'),
+                              'info'        => array('type'=>'string',
+                                                     'help' =>'Range description'
+                                                     ),
+                              'size'        => array('type'=>'integer',
+                                                     'help'=>'Maximum number of telephone numbers'
+                                                     ),
+                              'ttl'         => array('type'=>'integer',
+                                                     'help'=>'Cache period in DNS clients'
+                                                     ),
+                              'minDigits'         => array('type'=>'integer',
+                                                           'help'=>'Minimum number of digits for telephone numbers'
+                                                           ),
+                              'maxDigits'         => array('type'=>'integer',
+                                                           'help'=>'Maximum number of digits for telephone numbers'
+                              								)
hunk ./provisioning/ngnpro_client_lib.phtml 3382
-            $this->Fields['nameservers'] = array('type'=>'string',
-                                                 'name'=>'Name servers');
+            $this->Fields['nameservers'] = array('type'=>'text',
+                                                 'name'=>'Name servers',
+                                                 'help'=>'Name servers authoritative for this DNS zone'
+                                                 );
hunk ./provisioning/ngnpro_client_lib.phtml 3896
+        dprint_r($range);
hunk ./provisioning/ngnpro_client_lib.phtml 3909
-        printf ("<tr><td class=border>DNS name</td><td class=border>%s</td></td>",
+        printf ("<tr><td class=border>DNS zone</td><td class=border>%s</td></td>",
hunk ./provisioning/ngnpro_client_lib.phtml 3915
+                if ($item == 'nameservers') {
+                    foreach ($range->$item as $_item) {
+                        $nameservers.=$_item."\n";
+                    }
+                    $item_value=$nameservers;
+                } else {
+                    $item_value=$range->$item;
+                }
+
hunk ./provisioning/ngnpro_client_lib.phtml 3933
-                    <td class=border><textarea cols=30 name=%s_form rows=4>%s</textarea></td>
+                    <td class=border><textarea cols=30 name=%s_form rows=5>%s</textarea></td>
+                    <td class=border valign=top>%s</td>
hunk ./provisioning/ngnpro_client_lib.phtml 3938
-                    $range->$item
+                    $item_value,
+                    $this->FieldsAdminOnly[$item]['help']
hunk ./provisioning/ngnpro_client_lib.phtml 3945
+                    <td class=border>%s</td>
hunk ./provisioning/ngnpro_client_lib.phtml 3949
-                    $range->$item
+                    $item_value,
+                    $this->FieldsAdminOnly[$item]['help']
hunk ./provisioning/ngnpro_client_lib.phtml 3966
-                }
+            	}
+                $item_value=$nameservers;
+            } else {
+                $item_value=$range->$item;
+            }
hunk ./provisioning/ngnpro_client_lib.phtml 3972
+            if ($this->Fields[$item]['type'] == 'text') {
hunk ./provisioning/ngnpro_client_lib.phtml 3975
-                <td class=border><textarea cols=30 name=%s_form rows=6>%s</textarea></td>
-                </tr>",
-                $item_name,
-                $item,
-                $nameservers
-                );
-            } elseif ($this->Fields[$item]['type'] == 'text') {
-                printf ("<tr>
+                <td class=border><textarea cols=30 name=%s_form rows=5>%s</textarea></td>
hunk ./provisioning/ngnpro_client_lib.phtml 3977
-                <td class=border><textarea cols=30 name=%s_form rows=4>%s</textarea></td>
hunk ./provisioning/ngnpro_client_lib.phtml 3980
-                $range->$item
+                $item_value,
+                $this->Fields[$item]['help']
hunk ./provisioning/ngnpro_client_lib.phtml 3987
+                <td class=border>%s</td>
hunk ./provisioning/ngnpro_client_lib.phtml 3991
-                $range->$item
+                $item_value,
+                $this->Fields[$item]['help']
hunk ./provisioning/ngnpro_client_lib.phtml 4049
-                //printf ("<br>%s=%s",$var_name,$_REQUEST[$var_name]);
hunk ./provisioning/ngnpro_client_lib.phtml 6420
-                print "<option value=$t>$t";
+                print "<option value=$t>$t digits";
hunk ./provisioning/ngnpro_client_lib.phtml 6425
-            printf (" Prefix<input type=text size=5 name=prefix>");
+            printf (" Add prefix<input type=text size=5 name=prefix>");
hunk ./rating_lib.phtml 2702
-
hunk ./rating_lib.phtml 2705
-            if (in_array($soapEngineId,array_keys($soapEngines))) {
+            if (in_array($DATASOURCES[$this->cdr_source]['soapEngineId'],array_keys($soapEngines))) {
hunk ./rating_lib.phtml 2707
-                $this->SOAPurl  = $soapEngines[$soapEngineId]['url'];
+                $this->SOAPurl  = $soapEngines[$DATASOURCES[$this->cdr_source]['soapEngineId']]['url'];
hunk ./rating_lib.phtml 2709
-                                           "username"    => $soapEngines[$soapEngineId]['username'],
-                                           "password"    => $soapEngines[$soapEngineId]['password'],
-                                           "admin"       => $soapEngines[$soapEngineId]['admin']
+                                           "username"    => $soapEngines[$DATASOURCES[$this->cdr_source]['soapEngineId']]['username'],
+                                           "password"    => $soapEngines[$DATASOURCES[$this->cdr_source]['soapEngineId']]['password'],
+                                           "admin"       => true
hunk ./rating_lib.phtml 2726
-        $this->initOK=1;
hunk ./rating_lib.phtml 2761
-                                                'first_name' => $_profile->firstName,
-                                                'last_name'  => $_profile->lastName
+                                                'first_name' => $_profile->first_name,
+                                                'last_name'  => $_profile->last_name
hunk ./rating_lib.phtml 2838
-            $mc_value.= sprintf("%s:quota=%s;email=%s;fn=%s%s;block_by_quota=%d\n",
+            $mc_value.= sprintf("%s:quota=%s;email=%s;first_name=%s;last_name=%s;block_by_quota=%d\n",
hunk ./rating_lib.phtml 3147
-		if (!$this->initOK) return ;
-
hunk ./rating_lib.phtml 3379
-      	$this->blockAccountRemote($account);
-    
-        $query=sprintf("delete from grp
-        where username = '%s'
-        and   domain   = '%s'
-        and   grp      = '%s'",
-        addslashes($username),
-        addslashes($domain),
-        addslashes($this->quotaGroup)
-        );
-
-        dprint($query);
-
-        if (!$this->AccountsDB->query($query)) {
-            $log=sprintf ("Database error: %s (%s)",$this->AccountsDB->Error,$this->AccountsDB->Errno);
-            print $log;
-            syslog(LOG_NOTICE,$log);
-            return false;
-        }
-
-        $query=sprintf("insert into grp
-        (username,domain,grp,last_modified)
-        values
-        ('%s','%s','%s',NOW())",
-        addslashes($username),
-        addslashes($domain),
-        addslashes($this->quotaGroup)
-        );
+        if (is_object($this->soapclient)) {
+      		return  $this->blockAccountRemote($account);
+        } else {
hunk ./rating_lib.phtml 3383
-        dprint($query);
+            $log=sprintf ("Unblock account %s in sql",$account);
+            syslog(LOG_NOTICE, $log);
hunk ./rating_lib.phtml 3386
-        if (!$this->AccountsDB->query($query)) {
-            $log=sprintf ("Database error: %s (%s)",$this->AccountsDB->Error,$this->AccountsDB->Errno);
-            print $log;
-            syslog(LOG_NOTICE,$log);
-            return false;
+            // update OpenSER database using SQL query
+            $query=sprintf("delete from grp
+            where username = '%s'
+            and   domain   = '%s'
+            and   grp      = '%s'",
+            addslashes($username),
+            addslashes($domain),
+            addslashes($this->quotaGroup)
+            );
+    
+            dprint($query);
+    
+            if (!$this->AccountsDB->query($query)) {
+                $log=sprintf ("Database error: %s (%s)",$this->AccountsDB->Error,$this->AccountsDB->Errno);
+                print $log;
+                syslog(LOG_NOTICE,$log);
+                return false;
+            }
+    
+            $query=sprintf("insert into grp
+            (username,domain,grp,last_modified)
+            values
+            ('%s','%s','%s',NOW())",
+            addslashes($username),
+            addslashes($domain),
+            addslashes($this->quotaGroup)
+            );
+    
+            dprint($query);
+    
+            if (!$this->AccountsDB->query($query)) {
+                $log=sprintf ("Database error: %s (%s)",$this->AccountsDB->Error,$this->AccountsDB->Errno);
+                print $log;
+                syslog(LOG_NOTICE,$log);
+                return false;
+            } else {
+                return true;
+            }
hunk ./rating_lib.phtml 3425
-        return true;
hunk ./rating_lib.phtml 3428
-        if (!is_object($this->soapclient)) {
-            return true;
-        }
-
hunk ./rating_lib.phtml 3430
-        if (!$username || !$domain) return true;
+        if (!$username || !$domain) {
+            $log=sprintf("Error: misssing username/domain in blockAccountRemote()");
+	        syslog(LOG_NOTICE, $log);
+        	return false;
+        }
hunk ./rating_lib.phtml 3449
-                $from         = $this->CDRTool[provider][fromEmail];
-                $to           = $this->CDRTool[provider][toEmail];
+                $from         = $this->CDRTool['provider']['fromEmail'];
+                $to           = $this->CDRTool['provider']['toEmail'];
hunk ./rating_lib.phtml 3460
-            $log=sprintf ("Block remote account %s at %s",$account,$this->NGNProURL);
+            $log=sprintf ("Block account %s at %s",$account,$this->SOAPurl );
hunk ./rating_lib.phtml 3500
-                $log=sprintf ("Unblock remote account %s at %s",$account,$this->NGNProURL);
+                $log=sprintf ("Unblock remote account %s at %s",$account,$this->SOAPurl);