Remoting : Adding a site (ISPConfig + TheHostingTool Integration)

Discussion in 'Developers' Forum' started by jmontoya, Jun 14, 2010.

  1. ispcomm

    ispcomm Member

    I'm wondering if using bandwidth on howtoforge for bnpanel is reasonable or appropriate.

    Specially considering that Till is making a paid billing addon to ispconfig. Perhaps it would be better not to abuse his resources.

    OTOH, there's no better option at the moment so I'll have to keep going here.

    I tried to fix the bug in the order form (which doesn't work right now) but I was not successful (javascript is not my strength).

    I'm better at php/db interactions so I'm doing the extension of the client attributes (company name, vat id, ssn).

    I would like to ask what is your policy to accepting patches from external sources. Are you willing to import them (provided they are quality patches off course) ?

    ispcomm
     
  2. jwarnier

    jwarnier New Member

    In the best Open Source spirit, I guess ISPconfig can only get improvements by accepting patches for communication with other solutions.
    Its value get higher because the internal/proprietary billing solution might not fit all needs.
    And Till seems very welcoming.

    That being said, things specific to BNPanel should go somewhere else, while ISPconfig communication with other products are welcome here.

    As for BNPanel, it is still a very young project, building upon THT, but significantly different already.
    To be clear: we welcome any effort to submit patches from BNPanel to THT, as we do not plan to maintain BNPanel alone once our platform will be usable. We forked (let's face it) because the current THT stable is no longer evolving, and we do not want to cast shadow on their development branch.

    You are welcome to submit patches. We will evaluate them, and after a few "successful" ones, we can provide you rights to commit to it directly (still retaining the right to remove your changes if not appropriate, which would be motivated then).
    You are also welcome to improve ISPconfig the best you can.

    Do you feel the need for a forum or so for BNPanel on Google Code?
    Creating a forum for nobody else than us did not seem appropriate so far, but it can become an option if developers' team extends. Though I must admit that I personally don't like forums, and tend to prefer mailing-lists.
     
  3. ispcomm

    ispcomm Member

    bug report: flags

    1 more (small) bug: Editing a user in the admin area uppercases the country used to show the flag. Flag names are lowercase, which results in the flag not showing (fr becomes FR and the image FR.gif instead of fr.gif).

    ispcomm.
     
  4. jmontoya

    jmontoya New Member

    More comments:

    1. I fixed that mysql bug.

    2. You can check a brief explanation on how we relate BNPanel Packages with ISPConfig3:

    http://code.google.com/p/bnpanel/wiki/BNPanelPackages

    I'm checking the order jquery bug, this is due a subdomain option: Admin Area ->General configuration->Domain/Subdomain options


     
    Last edited: Aug 24, 2010
  5. jmontoya

    jmontoya New Member

    I also fixed that one.

     
    Last edited: Aug 24, 2010
  6. ispcomm

    ispcomm Member

    I understand and share your point of view. I'd choose a mailing list over a forum any time. Having to check multiple forums is very inefficient.

    I'm gaining motivation and momentum at the moment, so I'd like to explain my reasoning.

    I got interested in ispconfig because of it's integration with mydns. I've been using mydns since version 0.x and it's been a very good choice over the years.

    THT (and now bnpanel) seemed a natural evolution and integration of ispconfig.

    With that said, I'll need to implement some plugins for the panel so that some specific type of services can be offered. I don't like the template/plugin system of tht too much. It does not seem flexible enough for custom development. It's also lacking internationalization which is kind of a show stopper at the moment.

    ISPConfig looks much better in that respect, but is lacking the "hosting package" features everyone seems to expect nowadays.

    I'm using a modded multiserver ispcp installation that costed a small fortune in programming work (myself and my team). Unfortunately that could not be integrated in the main ispcp trunk because "we were too fast paced for their liking". It's a stable installation but is lacking some features that I would like to deploy without having to reinvent the wheel (the wheel being ispconfig).

    I agree that Bnpanel looks quite different already. The template structure and javascript are two examples. Let's hope that they'll borrow and accept as much of the changes as possible.

    I have already implemented the company/vatid stuff in bnpanel (testing now). It's a small change but spread accross several php and template files. Next will be the european tax calculation of VAT.

    I'll provide patch set agains your latest trunk asap.

    ispcomm
     
  7. ispcomm

    ispcomm Member

    @julio

    Julio:

    do you have an updated remoting class for ispconfig 3.0.3 ?

    I'm getting a soap function call missing function in the package management:

    client_templates_get_all

    Thank you.

    ispcomm
     
  8. jmontoya

    jmontoya New Member

    The latest version I use is the SVN trunk of ISPConfig commit 1944

    You can find it here: svn://svn.ispconfig.org/ispconfig3/trunk


     
  9. ispcomm

    ispcomm Member

    Thank you for the quick answer. I found an error in that part too :)

    The user's permissions are bad. When adding the remote user, the client_templates_get_all is prefixed by a space resulting in "permission denied" during the remote session. I fixed that in my DB, but if you have write account to ispconfig trunk, it's an easy fix.
    Code:
    ...list, client_templates_get_all;site...
    .

    Ouch! I think you needed a tester badly. I'm happy to be useful.

    I'm ready to go with my patches. I just need to test the order part (whether additional data is saved to db on order processing). I'll wait for your fix before submitting the patchset.

    ispcomm
     
  10. jmontoya

    jmontoya New Member

    Hello!

    I fixed that in ISPConfig SVN trunk thanks!
    SVN Commit 1945

     
  11. ispcomm

    ispcomm Member

    Here's a patch for that last bug in the remoting class
    Code:
    Index: interface/web/admin/form/remote_user.tform.php
    ===================================================================
    --- interface/web/admin/form/remote_user.tform.php	(revision 1944)
    +++ interface/web/admin/form/remote_user.tform.php	(working copy)
    @@ -50,7 +50,7 @@
     $function_list['mail_user_filter_get,mail_user_filter_add,mail_user_filter_update,mail_user_filter_delete'] = 'Mail user filter functions';
     $function_list['mail_filter_get,mail_filter_add,mail_filter_update,mail_filter_delete'] = 'Mail filter functions';
     $function_list['client_get,client_add,client_update,client_delete,client_get_sites_by_user,client_get_by_username,client_change_password'] = 'Client functions';
    -$function_list['server_get,get_function_list, client_templates_get_all'] = 'Server functions';
    +$function_list['server_get,get_function_list,client_templates_get_all'] = 'Server functions';
     $function_list['sites_cron_get,sites_cron_add,sites_cron_update,sites_cron_delete'] = 'Sites cron functions';
     $function_list['sites_database_get,sites_database_add,sites_database_update,sites_database_delete, sites_database_get_all_by_user'] = 'Sites database functions';
     $function_list['sites_ftp_user_get,sites_ftp_user_add,sites_ftp_user_update,sites_ftp_user_delete'] = 'Sites FTP-User functions';
    
    added: oops... I see you were quicker than me.

    ispcomm
     
  12. ispcomm

    ispcomm Member

    I got the dev setup running. Ispconfig3 head and Bnpanel head

    My patch for company details seems working too.

    Currently, adding a package adds the site to ispconfig. however, ispconfig works differently than cpanel/whm hence there's no mail domain nor dns created.

    I am wondering if it's a good idea to create the whole package instead (web+mail+dns). I think it might be appropriate.

    Sure. The user can do so by themselves, but it would be seen as overly complicated and lead to helpdesk tickets that could be avoided.

    This is however something that could break compatibility with other server backends (or lead to numerous if/then blocks in the code).

    A powerful package system could allow you to have web-only, mail-only, or any combination of web/mail/dns/dbase etc. Yet, THT was not designed with this in mind. Perhaps a "full-auto" or "full-manual" setting could be appropriate?

    ADDED: But off course if would be a good idea to use the new domain module of ispconfig to limit the user to the domain names purchased in manual mode (and auto too as the user can always edit himself out :)

    This is just a request for comments....

    ispcomm.
     
    Last edited: Aug 24, 2010
  13. jmontoya

    jmontoya New Member

    Hello ispcomm,

    In fact there's a code that do that work (adding dns and mail), but is commented right now (ispconfig.php) because we don't need that feature at the moment.

    Talking abour your suggestion, you can create a new parameter in BNPanel in the ISPConfig3 server configuration. So *all* Packages will be generated with all features (site/dns/mail) or just a simple site.

    Much better a new table could be created: "server_values" with this fields: (server_id, name, value, type) like the current config table. So every server (cpanel, whm, ispconfig) will have a table, where to put all the "personal" configuration.

    We didn't test BNPanel with CPanel/Whm is not our priority, waiting for external contributions :)



     
  14. BorderAmigos

    BorderAmigos New Member

    I'm interested in trying this out. Pardon my ignorance but I don't see how to install this on an ISPConfig 3 server. The installation guide is referenced but missing from the code.

    (Running the install/index.php file isn't working.)
     
    Last edited: Aug 24, 2010
  15. ispcomm

    ispcomm Member

    I think it is edited out from ispconfig.php right now, but I get the idea.

    Cough... I have developed some allergy towards proprietary panels (used sphera and ensim in the past).

    A table with settings and menu for editing could be a compromise and more easily accepted by upstream tht... will think about it. I still have to look at how exactly things are implemented in the front-end.

    ispcomm.
     
  16. ispcomm

    ispcomm Member

    You need trunk versions of bnpanel and ispconfig. There's some fixes in the previous posts.... but it's not a clean install experience... don't do this on a production system.

    you can use the THT install guide as reference.

    ispcomm
     
  17. BorderAmigos

    BorderAmigos New Member

    "don't do this on a production system"

    I'll wait a while then. Thanks.
     
  18. ispcomm

    ispcomm Member

    It would be nice if you could try the system on a test installation. You would help development :rolleyes:
     
  19. ispcomm

    ispcomm Member

    Patch for company/vatid/ssn

    I'm attaching a patch with the mod that enables 3 more fields for client (Company Name, Vat ID and Personal Fiscal ID/SSN). These are required fields for issuing invoices for the whole EU.
    I have not implemented the checks for validity.
    The patch fixes a small typo on the help of the "username" field too.
    The "install.sql" file was updated too. The update.sql was left untouched.
    Also there's a small fix (ugly) to disable a check of the path during installation as that leads to failure of installation if bnpanel is not in the root of the web site.

    Patch is agains head of the mercurial repository of bnpanel.
    Code:
    # hg diff        
    diff -r e76057f40cca admin/pages/packages.php
    --- a/admin/pages/packages.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/admin/pages/packages.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -316,4 +316,4 @@
     			break;
     		}
     	}
    -}
    \ No newline at end of file
    +}
    diff -r e76057f40cca admin/pages/users.php
    --- a/admin/pages/users.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/admin/pages/users.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -43,6 +43,9 @@
     					$array2['CLIENTIP'] = $client['ip'];
     					$array2['FIRSTNAME']= $client['firstname'];
     					$array2['LASTNAME'] = $client['lastname'];
    +					$array2['COMPANY'] = $client['company'];
    +					$array2['VATID'] = $client['vatid'];
    +					$array2['FISCALID'] = $client['fiscalid'];
     					$array2['ADDRESS'] 	= $client['address'];
     					$array2['CITY'] 	= $client['city'];
     					$array2['STATE'] 	= $client['state'];
    @@ -232,4 +235,4 @@
     			break;					
     		}		
     	}
    -}
    \ No newline at end of file
    +}
    diff -r e76057f40cca client/pages/details.php
    --- a/client/pages/details.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/client/pages/details.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -16,6 +16,9 @@
     		$array['DOMAIN'] 	= $data['domain'];
     		$array['FIRSTNAME'] = $data['firstname'];
     		$array['LASTNAME']	= $data['lastname'];
    +		$array['COMPANY']	= $data['company'];
    +		$array['VATID']		= $data['vatid'];
    +		$array['FISCALID']	= $data['fiscalid'];
     		$array['ADDRESS'] 	= $data['address'];
     		$array['CITY']		= $data['city'];
     		$array['STATE'] 	= $data['state'];
    @@ -125,4 +128,4 @@
     		echo $style->replaceVar("tpl/user/cedit.tpl", $array);
     	}		
     	
    -}
    \ No newline at end of file
    +}
    diff -r e76057f40cca includes/ajax.php
    --- a/includes/ajax.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/ajax.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -1309,6 +1309,9 @@
     					
     		$array['FIRSTNAME']		= $user_info['firstname'];
     		$array['LASTNAME'] 		= $user_info['lastname'];			
    +		$array['COMPANY'] 		= $user_info['company'];			
    +		$array['VATID'] 		= $user_info['vatid'];			
    +		$array['FISCALID'] 		= $user_info['fiscalid'];			
     		$array['SITENAME'] 		= $db->config('name');
     		$array['ORDER_ID'] 		= $order_id;
     		$array['PACKAGE'] 		= $order_info['PACKAGES'];
    @@ -1402,4 +1405,4 @@
     		//Redirect to the homepage  
     		$main->redirect();
     	}
    -}
    \ No newline at end of file
    +}
    diff -r e76057f40cca includes/class_order.php
    --- a/includes/class_order.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/class_order.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -31,6 +31,9 @@
     						
     			$array['FIRSTNAME']		= $user_info['firstname'];
     			$array['LASTNAME'] 		= $user_info['lastname'];			
    +			$array['COMPANY'] 		= $user_info['company'];			
    +			$array['VATID'] 		= $user_info['vatid'];			
    +			$array['FISCALID'] 		= $user_info['fiscalid'];			
     			$array['SITENAME'] 		= $db->config('name');
     			$array['ORDER_ID'] 		= $order_id;
     			$array['PACKAGE'] 		= $order_info['PACKAGES'];
    @@ -590,4 +593,4 @@
     		}*/	
     	}
     		
    -}
    \ No newline at end of file
    +}
    diff -r e76057f40cca includes/class_user.php
    --- a/includes/class_user.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/class_user.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -8,7 +8,7 @@
     
     class user extends model {
     	
    -	public $columns 	= array('id', 'user','email', 'password','salt', 'signup', 'ip', 'firstname', 'lastname', 'address', 'city', 'zip', 'state', 'country', 'phone', 'status');
    +	public $columns 	= array('id', 'user','email', 'password','salt', 'signup', 'ip', 'firstname', 'lastname', 'company', 'vatid', 'fiscalid', 'address', 'city', 'zip', 'state', 'country', 'phone', 'status');
     	public $table_name 	= 'users';
     	
     	/** 
    @@ -194,7 +194,8 @@
     					  WHERE user 		LIKE '%$query%'  OR 
     							email 		LIKE '%$query%'  OR 
     							firstname 	LIKE '%$query%'  OR
    -							lastname 	LIKE '%$query%'";
    +							lastname	LIKE '%$query%'  OR
    +							company		LIKE '%$query%'";
     			$result = $db->query($sql);
     			
     			if($db->num_rows($result) > 0) {
    @@ -268,4 +269,4 @@
     		//Let's wrap it all up.
     		return true;
     	}	
    -}
    \ No newline at end of file
    +}
    diff -r e76057f40cca includes/servers/ispconfig.php
    --- a/includes/servers/ispconfig.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/servers/ispconfig.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -302,6 +302,7 @@
     		$user_info					= $user->getUserById($user_id);			
     		$params['email'] 			= $user_info['email'];
     		$params['contact_name'] 	= $user_info['firstname'].' '.$user_info['lastname'];
    +		$params['company_name']		= $user_info['company'];
     		$params['street'] 			= $user_info['address'];
     		$params['city'] 			= $user_info['city'];
     		$params['state'] 			= $user_info['state'];
    @@ -850,4 +851,4 @@
     CREATE table install_package( package_id int NOT NULL AUTO_INCREMENT,name varchar(255),	package_path varchar(255),version varchar(255) ,PRIMARY KEY (package_id));
     INSERT into install_package (package_id, name, package_path, version) values ('1', 'chamilo', '/var/www/chamilo-1.8.7.1-stable', '1.8.7.1');		
     CREATE table install_package_web_domain ( id int NOT NULL AUTO_INCREMENT, domain_id int,package_id int, database_id int, status int,  PRIMARY KEY (id));
    - */
    \ No newline at end of file
    + */
    diff -r e76057f40cca includes/sql/install.sql
    --- a/includes/sql/install.sql	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/sql/install.sql	Wed Aug 25 07:50:27 2010 +0000
    @@ -455,6 +455,9 @@
       `ip` 			text NOT NULL,
       `firstname` 	varchar(50) NOT NULL,
       `lastname` 	varchar(50) NOT NULL,
    +  `company` varchar(255) default NULL,
    +  `vatid` varchar(11) default NULL,
    +  `fiscalid` varchar(15) default NULL,
       `address` 	varchar(50) NOT NULL,
       `city` 		varchar(50) NOT NULL,
       `zip` 		varchar(7) NOT NULL,
    diff -r e76057f40cca includes/tpl/orderform/orderform.tpl
    --- a/includes/tpl/orderform/orderform.tpl	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/tpl/orderform/orderform.tpl	Wed Aug 25 07:50:27 2010 +0000
    @@ -55,6 +55,7 @@
     		document.getElementById("sub").style.display = 'none';
     		document.getElementById("dom").style.display = '';
     	}	
    +
     	$.get('<AJAX>function=orderForm&package='+ document.getElementById("package").value, function(stuff) {
     		$("#custom").html('<table width="100%" border="0" cellspacing="2" cellpadding="0" id="custom">'+stuff+'</table>');		
     	});
    @@ -403,7 +404,7 @@
                   <tr>
                     <td>Username:</td>
                     <td><input type="text" name="username" id="username" /></td>
    -                <td align="left"><a title="The username is your unique identity to your account. This is both your client account and control panel username. Please keep it under 8 characters." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td align="left"><a title="The username is your unique identity to your account. This is both your client account and control panel username. Please keep it between 8 and 20." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
                     <td align="left" id="usercheck">&nbsp;</td>
                   </tr>
                   <tr>
    @@ -433,6 +434,24 @@
                     <td><input type="text" name="lastname" id="lastname" onchange="check('lastname', this.value)" /></td>
                     <td align="left"><a title="Your last name." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
                     <td id="lastnamecheck" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>Company:</td>
    +                <td><input type="text" name="company" id="company" onchange="check('company', this.value)" /></td>
    +                <td align="left"><a title="Your company name" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="companynamecheck" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>Tax ID (VAT):</td>
    +                <td><input type="text" name="vatid" id="vatid" onchange="check('vatid', this.value)" /></td>
    +                <td align="left"><a title="Company Tax registration number (VAT ID)" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="vatid" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>SSN/Fiscal ID</td>
    +                <td><input type="text" name="fiscalid" id="fiscalid" onchange="check('fiscalid', this.value)" /></td>
    +                <td align="left"><a title="Your SSN or Fiscal ID" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="fiscalid" align="left">&nbsp;</td>
                   </tr>
                   <tr>
                     <td>Address:</td>
    @@ -517,4 +536,4 @@
           </tr>
         </table>
     </form>
    -</div>
    \ No newline at end of file
    +</div>
    diff -r e76057f40cca includes/tpl/user/add.tpl
    --- a/includes/tpl/user/add.tpl	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/tpl/user/add.tpl	Wed Aug 25 07:50:27 2010 +0000
    @@ -78,6 +78,24 @@
                     <td align="left"><a title="Your last name." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
                     <td id="lastnamecheck" align="left">&nbsp;</td>
                   </tr>
    +             <tr>
    +                <td>Company:</td>
    +                <td><input type="text" name="company" id="company" onchange="check('company', this.value)" /></td>
    +                <td align="left"><a title="Your company name" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="companynamecheck" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>Tax ID (VAT):</td>
    +                <td><input type="text" name="vatid" id="vatid" onchange="check('vatid', this.value)" /></td>
    +                <td align="left"><a title="Company Tax registration number (VAT ID)" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="vatid" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>SSN/Fiscal ID</td>
    +                <td><input type="text" name="fiscalid" id="fiscalid" onchange="check('fiscalid', this.value)" /></td>
    +                <td align="left"><a title="Your SSN or Fiscal ID" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="fiscalid" align="left">&nbsp;</td>
    +              </tr>
                   <tr>
                     <td>Address:</td>
                     <td><input type="text" name="address" id="address" value="%address%"  onchange="check('address', this.value)" /></td>
    @@ -127,4 +145,4 @@
           
                 </table>
     </form>            
    -            
    \ No newline at end of file
    +            
    diff -r e76057f40cca includes/tpl/user/cedit.tpl
    --- a/includes/tpl/user/cedit.tpl	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/tpl/user/cedit.tpl	Wed Aug 25 07:50:27 2010 +0000
    @@ -41,6 +41,30 @@
         %LASTNAME%
           <!-- <input type="text" name="lastname" id="lastname" value="%LASTNAME%" readonly="readonly"/> -->
           <a title="Your last name." class="tooltip"><img src="<ICONDIR>information.png" /></a>
    +    </td>
    +  </tr>
    +    <tr>
    +    <td width="20%">Company:</td>
    +    <td>
    +    %COMPANY%
    +      <!-- <input type="text" name="company" id="company" value="%COMPANY%" readonly="readonly"/> -->
    +      <a title="Company name." class="tooltip"><img src="<ICONDIR>information.png" /></a>
    +    </td>
    +  </tr>
    +    <tr>
    +    <td width="20%">VAT ID:</td>
    +    <td>
    +    %VATID%
    +      <!-- <input type="text" name="vatid" id="vatid" value="%VATID%" readonly="readonly"/> -->
    +      <a title="Company VAT ID." class="tooltip"><img src="<ICONDIR>information.png" /></a>
    +    </td>
    +  </tr>
    +    <tr>
    +    <td width="20%">SSN/Fiscal ID:</td>
    +    <td>
    +    %FISCALID%
    +      <!-- <input type="text" name="fiscalid" id="fiscalid" value="%FISCALID%" readonly="readonly"/> -->
    +      <a title="User's SSN or Fiscal ID." class="tooltip"><img src="<ICONDIR>information.png" /></a>
         </td>
       </tr>
       <tr>
    @@ -116,4 +140,4 @@
         </tr>
     </table>
     </form>
    -</div>
    \ No newline at end of file
    +</div>
    diff -r e76057f40cca includes/tpl/user/clientdetails.tpl
    --- a/includes/tpl/user/clientdetails.tpl	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/tpl/user/clientdetails.tpl	Wed Aug 25 07:50:27 2010 +0000
    @@ -80,6 +80,39 @@
         <div class="sub">
           <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
    +          <td width="50%">Company:</td>
    +          <td align="right">%COMPANY%</a>
    +          <a title="Company name" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +        </tr>
    +      </table>
    +    </div>
    +</div>
    +<div class="subborder">
    +    <div class="sub">
    +      <table width="100%" border="0" cellspacing="0" cellpadding="0">
    +        <tr>
    +          <td width="50%">Vat ID:</td>
    +          <td align="right">%VATID%</a>
    +          <a title="Company VAT ID" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +        </tr>
    +      </table>
    +    </div>
    +</div>
    +<div class="subborder">
    +    <div class="sub">
    +      <table width="100%" border="0" cellspacing="0" cellpadding="0">
    +        <tr>
    +          <td width="50%">Fiscal ID</td>
    +          <td align="right">%FISCALID%</a>
    +          <a title="User's SSN/Fiscal ID" class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +        </tr>
    +      </table>
    +    </div>
    +</div>
    +<div class="subborder">
    +    <div class="sub">
    +      <table width="100%" border="0" cellspacing="0" cellpadding="0">
    +        <tr>
               <td width="50%">Address:</td>
               <td align="right">%ADDRESS%</a>
               <a title="User's address." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    @@ -140,4 +173,4 @@
             </tr>
           </table>
         </div>
    -</div>
    \ No newline at end of file
    +</div>
    diff -r e76057f40cca includes/tpl/user/edit.tpl
    --- a/includes/tpl/user/edit.tpl	Mon Aug 23 19:17:53 2010 +0200
    +++ b/includes/tpl/user/edit.tpl	Wed Aug 25 07:50:27 2010 +0000
    @@ -60,6 +60,24 @@
                     <td id="lastnamecheck" align="left">&nbsp;</td>
                   </tr>
                   <tr>
    +                <td>Company:</td>
    +                <td><input type="text" name="company" id="company" value="%company%" onchange="check('company', this.value)" /></td>
    +                <td align="left"><a title="Company name." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="companynamecheck" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>VAT ID:</td>
    +                <td><input type="text" name="vatid" id="vatid" value="%vatid%" onchange="check('vatid', this.value)" /></td>
    +                <td align="left"><a title="Company VAT id." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="vatid" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
    +                <td>SSN/Fiscal ID:</td>
    +                <td><input type="text" name="fiscalid" id="fiscalid" value="%fiscalid%" onchange="check('lastname', this.value)" /></td>
    +                <td align="left"><a title="Fiscal ID or SSN." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    +                <td id="fiscalidcheck" align="left">&nbsp;</td>
    +              </tr>
    +              <tr>
                     <td>Address:</td>
                     <td><input type="text" name="address" id="address" value="%address%"  onchange="check('address', this.value)" /></td>
                     <td align="left"><a title="Your personal address." class="tooltip"><img src="<URL>themes/icons/information.png" /></a></td>
    @@ -109,4 +127,4 @@
           
                 </table>
     </form>            
    -            
    \ No newline at end of file
    +            
    diff -r e76057f40cca install/index.php
    --- a/install/index.php	Mon Aug 23 19:17:53 2010 +0200
    +++ b/install/index.php	Wed Aug 25 07:50:27 2010 +0000
    @@ -21,7 +21,7 @@
     }
     $compare = explode($_SERVER["DOCUMENT_ROOT"], $file);
     if($prepend . $compare[1] !== $_SERVER["PHP_SELF"]) {
    -	die("You can only run the install from the <em>".__FILE__."</em> file.");
    +//	die("You can only run the install from the <em>".__FILE__."</em> file.");
     }
     
    
     
  20. ispcomm

    ispcomm Member

    sorry.. I found the commented code you were referring to in "public function signup".

    I have a question:

    -) The sites are created in the "inactive" state right now.
    -) Invoices send via email are empty.

    Any hints why this could be ?

    thank you.
    ispcomm.
     

Share This Page