Completed
Push — v3.0 ( 495b61...be1e07 )
by Samir
24:09 queued 10:48
created
web_interface/astpp/application/controllers/newmail.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,23 +29,23 @@
 block discarded – undo
29 29
 		parent::__construct();
30 30
 	}
31 31
 	
32
-	function index(){
32
+	function index() {
33 33
 		$data['account_info'] = $this->session->userdata['accountinfo'];
34 34
 		$data['username'] = $this->session->userdata('user_name');
35 35
 		$data['page_title'] = "Test Mail";
36
-		$this->load->view('view_newmail',$data);
36
+		$this->load->view('view_newmail', $data);
37 37
 	}
38
-	function customer_mail_result($flag=FALSE){
38
+	function customer_mail_result($flag = FALSE) {
39 39
 	$account_info = $this->session->userdata['accountinfo'];
40 40
 		$post_array = $this->input->post();
41
-	$post_array['accountid']=$account_info['id'];
42
-	$post_array['history_id']=0;
43
-	$post_array['email']=$post_array['to'];
41
+	$post_array['accountid'] = $account_info['id'];
42
+	$post_array['history_id'] = 0;
43
+	$post_array['email'] = $post_array['to'];
44 44
 	unset($post_array['to']);
45
-	$this->email_lib->send_email($post_array,$post_array,'','',0,0);
45
+	$this->email_lib->send_email($post_array, $post_array, '', '', 0, 0);
46 46
 		$this->thanks();
47 47
 	}
48
-	function thanks(){
48
+	function thanks() {
49 49
 			$this->load->view('view_mail_response');
50 50
 	}	
51 51
 
Please login to merge, or discard this patch.
web_interface/astpp/application/config/cron.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@
 block discarded – undo
9 9
 */
10 10
 
11 11
 $astpp_config = parse_ini_file("/var/lib/astpp/astpp-config.conf");
12
-$config['SERVER_NAME'] 		= $astpp_config['base_url'];	// Your web site url
13
-$config['CRON_TIME_LIMIT']	= 0;								// 0 = no time limit
14
-$config['argv']			= array("LowBalance"=>"lowbalance/low_balance",
12
+$config['SERVER_NAME'] = $astpp_config['base_url']; // Your web site url
13
+$config['CRON_TIME_LIMIT'] = 0; // 0 = no time limit
14
+$config['argv'] = array("LowBalance"=>"lowbalance/low_balance",
15 15
 					"Lowcredit"=>"lowcreditlimit/low_creditlimit",
16 16
 					"UpdateBalance" => "updateBalance/GetUpdateBalance",
17 17
 						"CurrencyUpdate" => "currencyupdate/update_currency",
18 18
 					"GenerateInvoice" => "generateInvoice/getInvoiceData",
19 19
 					"FeedBack"=>"feedback/customer_feedback_result/TRUE",
20 20
 					"BroadcastEmail" => "broadcastemail/broadcast_email");
21
-$config['CRON_BETA_MODE']	= false;							// Beta Mode (useful for blocking submissions for testing)
21
+$config['CRON_BETA_MODE'] = false; // Beta Mode (useful for blocking submissions for testing)
22 22
 
23 23
 ?>
Please login to merge, or discard this patch.
web_interface/astpp/application/language/english/menu_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 //Main Menu
3 5
 $lang['Home'] = 'Home';
4 6
 $lang['Global Accounts'] = 'Global Accounts';
Please login to merge, or discard this patch.
web_interface/astpp/application/language/english/footer_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,5 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 $lang['FOOTER.FOOTER'] = 'Copyright &copy; 2003 - 2012. ASTPP - Open Source VOIP Billing Solution. All Rights Reserved.';
3 5
 ?>
Please login to merge, or discard this patch.
web_interface/astpp/application/language/spanish/menu_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 //Main Menu
3 5
 $lang['Home'] = 'Casa';
4 6
 $lang['Global Accounts'] = 'cuentas globales';
Please login to merge, or discard this patch.
web_interface/astpp/application/language/spanish/footer_lang.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,5 @@
 block discarded – undo
1
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1
+<?php if ( ! defined('BASEPATH')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 $lang['FOOTER.FOOTER'] = 'Copyright © 2003 - 2012. ASTPP - Open Source Solución de Facturación VOIP. Todos los Derechos Reservados.';
3 5
 ?>
Please login to merge, or discard this patch.
web_interface/astpp/application/libraries/locale_menu.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@  discard block
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if ( ! defined('BASEPATH'))
25 25
 	exit('No direct script access allowed');
26 26
 
27 27
 /**
28 28
  * Dynamically build forms for display
29 29
  */
30
-class locale_Menu{
30
+class locale_Menu {
31 31
 
32 32
 	function __construct($library_name = '') {
33 33
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		$this->CI->load->model('db_model');
36 36
 		$this->CI->load->library('email');
37 37
 		$this->CI->load->library('session');
38
-	$current_locale=$this->CI->session->userdata('user_language');
38
+	$current_locale = $this->CI->session->userdata('user_language');
39 39
 	putenv("LC_ALL=$current_locale");
40 40
 	setlocale(LC_ALL, $current_locale); 
41 41
 	bindtextdomain(WEBSITE_DOMAIN, FCPATH.'/application/modules/dashboard/language');
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if (!defined('BASEPATH')) {
25 25
 	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 /**
28 29
  * Dynamically build forms for display
Please login to merge, or discard this patch.
web_interface/astpp/application/libraries/global_locale.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,19 +21,19 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if ( ! defined('BASEPATH'))
25 25
 	exit('No direct script access allowed');
26 26
 
27 27
 /**
28 28
  * Dynamically build forms for display
29 29
  */
30
-class Global_locale{
30
+class Global_locale {
31 31
 
32 32
 	function __construct($library_name = '') {
33 33
 
34 34
 		$this->CI = & get_instance();
35 35
 	header("Expires: Tue, 01 Jan 2000 00:00:00 GMT");
36
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
36
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
37 37
 	header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
38 38
 	header("Cache-Control: post-check=0, pre-check=0", false);
39 39
 	header("Pragma: no-cache");
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if (!defined('BASEPATH')) {
25 25
 	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 /**
28 29
  * Dynamically build forms for display
Please login to merge, or discard this patch.
web_interface/astpp/application/views/footer.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 	if($result->num_rows() > 0){
13 13
 		$result=$result->result_array();
14 14
 		$footer = $result[0]['website_footer'];
15
-	}else{
15
+	} else{
16 16
 		$footer = '';
17 17
 	}
18 18
   	if($footer != ''){ ?>
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
    <div class="padding-b-10 col-md-12 no-padding">
7 7
 	
8 8
   <?php
9
-	$str = isset($_SERVER['HTTPS'])&& $_SERVER['HTTPS'] == 'on' ? 'https://' :'http://';
9
+	$str = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
10 10
 	$this->db->select('*');	
11
-	$this->db->where('domain',$_SERVER['HTTP_HOST']);
12
-	$this->db->or_where('domain','http://'.$_SERVER['HTTP_HOST']);
13
-	$this->db->or_where('domain','https://'.$_SERVER['HTTP_HOST']);
14
-	$result=$this->db->get('invoice_conf');
15
-	if($result->num_rows() > 0){
16
-		$result=$result->result_array();
11
+	$this->db->where('domain', $_SERVER['HTTP_HOST']);
12
+	$this->db->or_where('domain', 'http://'.$_SERVER['HTTP_HOST']);
13
+	$this->db->or_where('domain', 'https://'.$_SERVER['HTTP_HOST']);
14
+	$result = $this->db->get('invoice_conf');
15
+	if ($result->num_rows() > 0) {
16
+		$result = $result->result_array();
17 17
 		$footer = $result[0]['website_footer'];
18
-	}else{
18
+	} else {
19 19
 		$footer = '';
20 20
 	}
21
-  	if($footer != ''){ ?>
21
+  	if ($footer != '') { ?>
22 22
 		 <div style="margin-left:470px; "><?=$footer ?>
23 23
 		 
24 24
 		 <div style="" class="pull-left">
Please login to merge, or discard this patch.