Skip to content
This repository has been archived by the owner on Jun 17, 2020. It is now read-only.

Commit

Permalink
Merge pull request tools4isp#16 from Petertjuh360/master
Browse files Browse the repository at this point in the history 
Add support for package names
  • Loading branch information
@nlmark
nlmark committed Dec 5, 2015
2 parents 7ccc593 + db0e133 commit 962392c
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions content/home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
}elseif($product['type'] == 'stream'){
$type = $lang->translate(679);
}
$html .= '<tr><td><a href="?lang='.lang_get_value_defaultlang().'&page='.$product['type'].'&id='.$product['pakket_id'].'"><u>'.$type.' '.$product['pakket_id'].'</u></a></td><td>';
$html .= '<tr><td><a href="?lang='.lang_get_value_defaultlang().'&page='.$product['type'].'&id='.$product['pakket_id'].'"><u>'.$type.' - '.$product['pakket_name'].'</u></a></td><td>';
if(check_user_right(get_value_session('from_db','id'),'klantbekijken',get_value_session('from_db','is_admin')) != FALSE){
$html .= '<u><a href="?lang='.lang_get_value_defaultlang().'&page=klanten&type=bekijken&id='.$userdata['id'].'">'.$userdata['username'].'</a></u>';
}else{
Expand Down Expand Up @@ -184,4 +184,4 @@
}
}

?>
?>
10 changes: 8 additions & 2 deletions content/producten.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
$html .= '<br /><p><b>'.$lang->translate(674).'</b></p><br /><br />';
}
}else{
$pakket_name = $pakket['pakket_name'];
$domain_pakket_limit = dns_get_value_pakket($pakket['pakket_id'],'domain');
$template_pakket_limit = dns_get_value_pakket($pakket['pakket_id'],'template');
$domain_pakket_used = dns_get_value_current_usage($pakket['pakket_id'],'domain');
Expand All @@ -60,6 +61,7 @@
$html .= '<div class="tablestop1"><table>';

$html .= '<tr><td>'.$lang->translate(1200).'</td><td>'.$lang->translate(664).'</td><td>'.$lang->translate(665).'</td></tr>';
$html .= '<tr><td>'.$lang->translate(690).'</td><td> - </td><td><input type="text" name="pakket_name" id="domlimit" value="'.$pakket_name.'"></td></tr>';
$html .= '<tr><td>'.$lang->translate(666).'</td><td>'.$domain_pakket_used.'</td><td><input type="text" name="domlimit" id="domlimit" value="'.$domain_pakket_limit.'"></td></tr>';
$html .= '<tr><td>'.$lang->translate(667).'</td><td>'.$template_pakket_used.'</td><td><input type="text" name="temlimit" id="temlimit" value="'.$template_pakket_limit.'"></td></tr>';
$html .= '<tr><td>'.$lang->translate(668).'</td><td>'.$domain_total_used.'</td><td>'.$domain_total_limit.'</td></tr>';
Expand All @@ -78,6 +80,7 @@
if($pakket !== FALSE){
if(get_value_get('p') == "dns"){
if(check_user_subuser(get_value_session('from_db','id'),$pakket['user_id'],$type = 3) !== FALSE || $pakket['user_id'] == get_value_session('from_db','id') || get_value_session('from_db','is_admin') == '1'){
$pakket_name = $pakket['pakket_name'];
$domain_pakket_limit = dns_get_value_pakket($pakket['pakket_id'],'domain');
$template_pakket_limit = dns_get_value_pakket($pakket['pakket_id'],'template');
$domain_pakket_used = dns_get_value_current_usage($pakket['pakket_id'],'domain');
Expand All @@ -92,6 +95,7 @@
$html .= ''.$lang->translate(671).'<br /><br /></p>';
$html .= '<div class="tablestop1"><table>';
$html .= '<tr><td>'.$lang->translate(1200).'</td><td>'.$lang->translate(664).'</td><td>'.$lang->translate(665).'</td></tr>';
$html .= '<tr><td>'.$lang->translate(690).'</td><td> - </td><td>'.$pakket_name.'</td></tr>';
$html .= '<tr><td>'.$lang->translate(666).'</td><td>'.$domain_pakket_used.'</td><td>'.$domain_pakket_limit.'</td></tr>';
$html .= '<tr><td>'.$lang->translate(667).'</td><td>'.$template_pakket_used.'</td><td>'.$template_pakket_limit.'</td></tr>';
$html .= '<tr><td>'.$lang->translate(668).'</td><td>'.$domain_total_used.'</td><td>'.$domain_total_limit.'</td></tr>';
Expand All @@ -100,6 +104,7 @@
}
}elseif(get_value_get('p') == "stream"){
if(check_user_subuser(get_value_session('from_db','id'),$pakket['user_id'],$type = 3) !== FALSE || $pakket['user_id'] == get_value_session('from_db','id') || get_value_session('from_db','is_admin') == '1'){
$pakket_name = $pakket['pakket_name'];
$listeners_pakket_limit = stream_get_value_pakket($pakket['pakket_id'],'listeners');
$listeners_pakket_used = stream_get_value_current_usage($pakket['pakket_id'],'listeners');
$listeners_total_limit = pakketten_get_value_size_stream($pakket['user_id'],'listeners');
Expand All @@ -110,6 +115,7 @@
$html .= ''.$lang->translate(682).'<br /><br />';
$html .= '<table border="1">';
$html .= '<tr><td></td><td>'.$lang->translate(664).'</td><td>'.$lang->translate(665).'</td></tr>';
$html .= '<tr><td>'.$lang->translate(690).'</td><td> - </td><td>'.$pakket_name.'</td></tr>';
$html .= '<tr><td>'.$lang->translate(680).'</td><td>'.$listeners_pakket_used.'</td><td>'.$listeners_pakket_limit.'</td></tr>';
$html .= '<tr><td>'.$lang->translate(681).'</td><td>'.$listeners_total_used.'</td><td>'.$listeners_total_limit.'</td></tr>';
$html .= '</table>';
Expand Down Expand Up @@ -476,7 +482,7 @@
}elseif($product['type'] == 'stream'){
$type = $lang->translate(679);
}
$html .= '<tr><td><a href="?lang='.lang_get_value_defaultlang().'&page='.$product['type'].'&id='.$product['pakket_id'].'"><u>'.$type.' '.$product['pakket_id'].'</u></a></td><td>';
$html .= '<tr><td><a href="?lang='.lang_get_value_defaultlang().'&page='.$product['type'].'&id='.$product['pakket_id'].'"><u>'.$type.' - '.$product['pakket_name'].'</u></a></td><td>';
if(check_user_right(get_value_session('from_db','id'),'klantbekijken',get_value_session('from_db','is_admin')) != FALSE){
$html .= '<u><a href="?lang='.lang_get_value_defaultlang().'&page=klanten&type=bekijken&id='.$userdata['id'].'">'.$userdata['username'].'</a></u>';
}else{
Expand Down Expand Up @@ -517,4 +523,4 @@
$html = '<b>'.$lang->translate(625).'</b>';
$html .= '<br /><br />'.$lang->translate(626).'<br /><br />';
}
?>
?>
1 change: 1 addition & 0 deletions dnsshop.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ CREATE TABLE IF NOT EXISTS `pakketten` (
`type` varchar(25) NOT NULL,
`user_id` int(255) NOT NULL,
`pakket_id` int(255) NOT NULL,
`pakket_name` varchar(25) NOT NULL,
PRIMARY KEY (`id`),
KEY `type` (`type`,`user_id`,`pakket_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
Expand Down
6 changes: 3 additions & 3 deletions function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,10 @@ function menu_create_information_default($page){
foreach($pakketten as $pakket){
if($pakket['user_id'] == get_value_session('from_db','id')){
if($pakket['type'] == 'dns'){
$menu[$lang->translate(25)][$lang->translate(26).' '.$pakket['pakket_id']]['url'] = '&page='.$pakket['type'].'&id='.$pakket['pakket_id'];
$menu[$lang->translate(25)][$pakket['pakket_name']]['url'] = '&page='.$pakket['type'].'&id='.$pakket['pakket_id'];
$menu[$lang->translate(25)][$lang->translate(26).' '.$pakket['pakket_id']]['plaatje'] = 'dns.png';
}elseif($pakket['type'] == 'stream'){
$menu[$lang->translate(25)][$lang->translate(27).' '.$pakket['pakket_id']]['url'] = '&page='.$pakket['type'].'&id='.$pakket['pakket_id'];
$menu[$lang->translate(25)][$pakket['pakket_name']]['url'] = '&page='.$pakket['type'].'&id='.$pakket['pakket_id'];
$menu[$lang->translate(25)][$lang->translate(27).' '.$pakket['pakket_id']]['plaatje'] = 'stream.png';
}
}
Expand Down Expand Up @@ -1369,4 +1369,4 @@ function pakketten_do_action_create_stream(){
return FALSE;
}
}
}
}
1 change: 1 addition & 0 deletions lang/en.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
680,Listeners within the package;
681,Total Listeners within from user;
682,Type package: Streaming;
690,Package name;
701,It was impossible to find something to display;
702,Domain name;
703,Template name;
Expand Down
1 change: 1 addition & 0 deletions lang/nl.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
680,Luisteraars binnen het pakket;
681,Totaal luisteraars van gebruiker;
682,Type pakket: Streaming;
690,Pakketnaam;
701,Er kon niets gevonden worden om weer te geven;
702,Domeinnaam;
703,Template naam;
Expand Down
1 change: 1 addition & 0 deletions packagename.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE `pakketten` ADD `pakket_naam` VARCHAR( 25 ) NOT NULL;

0 comments on commit 962392c

Please sign in to comment.