[Removed calls to to global vars
Adrian Georgescu <ag@ag-projects.com>**20070914174406
 Added smarty dpenedency to debian package
 Renamed OP to Customer
 
] hunk ./debian/control 10
-Depends: debconf (>= 0.5), apache2 | httpd,  libapache2-mod-php5 | libapache-mod-php5 | libapache2-mod-php4 | libapache-mod-php4 , php5 | php4, php5-cli | php4-cli , php5-mysql | php4-mysql, php5-curl | php4-curl,  php-pear , php-soap, mrtg, php5-memcache | php4-memcache, memcached , monit
+Depends: debconf (>= 0.5), apache2 | httpd,  libapache2-mod-php5 | libapache-mod-php5 | libapache2-mod-php4 | libapache-mod-php4 , php5 | php4, php5-cli | php4-cli , php5-mysql | php4-mysql, php5-curl | php4-curl,  php-pear , php-soap, mrtg, php5-memcache | php4-memcache, memcached , monit, smarty
hunk ./debian/control 12
-Description:  CDR mediation and accounting system for SIP service providers
+Description:  CDR mediation and accounting system for OpenSER
hunk ./debian/control 16
- Supports out-of-the-box OpenSER, Asterisk and Cisco.
hunk ./provisioning/provisioning_logic.phtml 457
-                        'SIP Usage'       => array('recordsClass' => 'DomainStatistics',
-                                           'soapClass'    => 'WebService_NGNPro_SipPort'
-                                          ),
hunk ./provisioning/provisioning_logic.phtml 811
-        print "OP";
+        if ($this->version > 1) {
+        print "Customer";
hunk ./provisioning/provisioning_logic.phtml 825
+        }
hunk ./provisioning/provisioning_logic.phtml 1483
-            print "OP";
+            print "Customer";
hunk ./provisioning/provisioning_logic.phtml 2011
-            print "<nobr>OP";
+            print "<nobr>";
+            print "Customer";
hunk ./provisioning/provisioning_logic.phtml 2602
-            print "OP";
+            print "Customer";
hunk ./provisioning/provisioning_logic.phtml 3020
-            print "OP";
+            print "Customer";
hunk ./provisioning/provisioning_logic.phtml 3759
-            print "OP";
+            print "Customer";
hunk ./provisioning/provisioning_logic.phtml 4302
-            print "OP";
+            print "Customer";
hunk ./provisioning/sip_settings_lib.phtml 4
-require_once('SOAP/Client.php');
-require_once("phone_images.php");
hunk ./provisioning/sip_settings_lib.phtml 99
-    function SIPSettings($account='',$loginCredentials) {
+    function SIPSettings($account='',$loginCredentials,$soapEngines) {
+    	$this->soapEngines        = $soapEngines;
+
hunk ./provisioning/sip_settings_lib.phtml 106
-		$this->loginCredentials = &$loginCredentials;
+		$this->loginCredentials   = &$loginCredentials;
hunk ./provisioning/sip_settings_lib.phtml 108
-        $this->reseller           = $loginCredentials['reseller'];
-        $this->customer           = $loginCredentials['customer'];
hunk ./provisioning/sip_settings_lib.phtml 110
+        if ($this->loginType == "admin") {
+            if ($_REQUEST['reseller']) {
+            	$this->reseller = $_REQUEST['reseller'];
+            } else {
+            	$this->reseller = $loginCredentials['reseller'];
+            }
+            if ($_REQUEST['customer']) {
+            	$this->customer = $_REQUEST['customer'];
+            } else {
+            	$this->customer = $loginCredentials['customer'];
+            }
+        } else {
+        	$this->reseller           = $loginCredentials['reseller'];
+        	$this->customer           = $loginCredentials['customer'];
+        }
+
hunk ./provisioning/sip_settings_lib.phtml 136
+
hunk ./provisioning/sip_settings_lib.phtml 252
-        global $soapEngines;
-    	$this->soapEngines=$soapEngines;
hunk ./provisioning/sip_settings_lib.phtml 253
+		require_once('SOAP/Client.php');
hunk ./provisioning/sip_settings_lib.phtml 2127
-        global $Status;
hunk ./provisioning/sip_settings_lib.phtml 2135
-        	global ${$el};
+        	${$el} = $_REQUEST[$el];
hunk ./provisioning/sip_settings_lib.phtml 2233
-            dprint ("<table bgcolor=lightgrey><tr><td>$Status</td></tr></table>");
hunk ./provisioning/sip_settings_lib.phtml 2378
-            global $delete_voicemail;
+            $delete_voicemail = $_REQUEST['delete_voicemail'];
hunk ./provisioning/sip_settings_lib.phtml 2380
-			dprint("delete_voicemail=$delete_voicemail");
hunk ./provisioning/sip_settings_lib.phtml 4954
-            global ${$el};
-            if (!is_array($_REQUEST[$el])) ${$el}=trim($_REQUEST[$el]);
+            ${$el}=trim($_REQUEST[$el]);
hunk ./provisioning/sip_settings_lib.phtml 5018
-
-        print "
-        <tr>
-          <td height=3 colspan=2></td>
-        </tr>
-        <tr>
-          <td class=border align=center valign=middle>";
-
-           print "
-           <a href=http://one.address.name target=oneaddress><img src=unsecure/pidn/images/PIDNCard-EN-135.jpg border=0></a>";
-
-            print "
-            <td class=border>
-            <b>Personal SIP domain</b>
-
-            <p>
-            Register your personal Internet Domain with Managed DNS
-            to benefit of the following features:
-
-            <ul>
-            <li>Same address for both email and SIP
-            <li>Voicemail and voice 2 email
-            <li>Privacy control
-            <li>Call forwading
-            <li>Selective call accept
-            <li>Selective call reject
-            <li>Time based forwarding
-            </ul>
-            ";
-
-            global $tlds, $DOMAIN;
-
-            require_once('registrar/registrationwizard.php');
-            $environment = 'production';
-            $regwiz = new RegistrationWizard($DOMAIN, $environment);
-            $regwiz->showSelectDomainForm('dns_register.phtml', true);
-
-            print "
-          </td>
-        </tr>
-        ";
-
-        if ($this->timezone=="Europe/Bucharest" || $this->Preferences['language']=="ro") {
-            print "
-            <tr>
-              <td height=3 colspan=2></td>
-            </tr>
-            <tr>
-              <td class=border align=center>";
-               print "<img src=resellers/template/1745/eurovoice.gif border=0></a>";
-
-                print "
-                <td class=border>
-                <b>Romanian telephone number and calls to and from PSTN </b>
-
-                <p>
-
-				From <a href=http://www.euroweb.ro>Euroweb Romania</a> you may obtain a Romanian
-                telephone number (+40317XXXXX) and route PSTN calls for that number to your
-                SIP device. Eurovoice allows free SIP calls to and out their network using standards
-                like ENUM and SIP and
-                puts no restrictions on access to other networks.
-                <p>
-                For more information see:
-                <a href=http://www.eurovoice.ro target=bpc>http://www.eurovoice.ro</a>
-                ";
-
-                print "
-              </td>
-            </tr>
-            ";
-        }
-
-
-        print "
-        <tr>
-          <td height=3 colspan=2></td>
-        </tr>
-        <tr>
-          <td height=3 colspan=2></td>
-        </tr>
-        <tr>
-          <td class=border align=center>";
-        print "<a href=\"javascript:void(null);\" onClick=\"return window.open('images/snom190_big.jpg', 'SNOM 190',
-        'toolbar=0,status=0,menubar=0,scrollbars=1,resizable=0,width=737,height=492')\">
-        <img src=images/snom190-150p.jpg border=0></a>";
-
-        print "<td class=border>";
-
-        printf (_("%s phone may be shipped without programming
-        to end-users for a real plug-and-play experience. "),"SNOM 190");
-
-        print "<p>";
-
-        printf (_("%s is a high-end SIP phone with multiple lines,
-        audio encryption (Secure RTP), rich codec support
-        (G723, G729, GSM, G722 and G711), has two line LCD
-        display, programmable keys, speaker-phone and a powerful
-        web interface with address book and URL dialing. "),"SNOM 190");
-
-        print "
-        <form action=buy.phtml method=POST target=buy>
-        <select name=service>
-        <option value=voipSnom190>SNOM 190 SIP phone
-        </select>
-        <input type=hidden name=units value=1>
-        <input type=hidden name=service_line value=DNS>
-        <input type=hidden name=action value=Add>
-        <input type=submit value=Order>
-        <input type=hidden name=logonce value=yes>
-        <input type=hidden name=step value=1>
-        </form>
-        ";
-
-            print "
-          </td>
-        </tr>
-        ";
-
-
hunk ./provisioning/sip_settings_lib.phtml 5470
-    global $userAgentImages;
+// array with mappings between User Agents and images
+    if (file_exists("phone_images.php")) {
+		include_once("phone_images.php");
+    } else {
+		$userAgentImages = array("Asterisk"       => "asterisk.png",
+                         "AVM FRITZ"      => "avm-fritzbox-wlan.png",
+                         "Cisco ATA"      => "cisco-ata.png",
+                         "Cisco.*Gateway" => "cisco.png",
+                         "CSCO"           => "cisco-7960.png",
+                         "DrayTek"        => "draytek-vigor2600vg.png",
+                         "eStara"         => "eStara.png",
+                         "Eyebeam"        => "eyebeam.png",
+                         "Grandstream"    => "handytone.png",
+                         "ipDialog"       => "ipDialog.png",
+                         "Linksys"        => "linksys-pap2.png",
+                         "Session.*Wave"  => "session.png",
+                         "SIPPS"          => "sipps.png",
+                         "Sipura"         => "spa2000.png",
+                         "sjphone"        => "sjphone.png",
+                         "Snom100"        => "snom100.png",
+                         "Snom(190|200)"  => "snom200.png",
+                         "Snom320"        => "snom320.png",
+                         "Snom360"        => "snom360.png",
+                         "snomSoft"       => "snom360.png",
+                         "Talkin"         => "xten.png",
+                         "unidata"        => "hitachi-wip5000.png",
+                         "Vizufon"        => "vizufon.png",
+                         "voipster"       => "zoep.png",
+                         "Windows RTC"    => "messenger.png",
+                         "X-Lite"         => "xten.png",
+                         "X-PRO"          => "xten.png",
+                         "ZyXEL P2000W"   => "zyxel-p2000.png",
+                         "-IMVP"          => "innomedia-mta5000.png",
+                         "3610\/"         => "siemens-3610.png",
+                         "cirpack"        => "cirpack.png",
+                         "Brcm-Callctrl"  => "webstarepx2203.png",
+                         "Audiocodes-Sip-Gateway-MP" => "audiocodes-mp124.png",
+                         "Nokia"	  => "nokia.png",
+                         "CopperJet"	  => "copperjet16162p.png",
+                         "Ekiga"	  => "ekiga.png"
+                         );
+    }
hunk ./provisioning/sip_settings_logic.phtml 4
-$SIPSettings = new $SIPSettings_class($account,$loginCredentials);
+$SIPSettings = new $SIPSettings_class($account,$loginCredentials,$soapEngines);
hunk ./provisioning/sip_settings_logic.phtml 19
-            $SIPSettings = new $SIPSettings_class($account,$loginCredentials);
+            $SIPSettings = new $SIPSettings_class($account,$loginCredentials,$soapEngines);
hunk ./provisioning/sip_settings_logic.phtml 21
-            $SIPSettings = new $SIPSettings_class($account,$loginCredentials);
+            $SIPSettings = new $SIPSettings_class($account,$loginCredentials,$soapEngines);