X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fprint_profiles.php;h=534c5168cf19ed88bccaf6c55ba4e2161166ce9b;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=02e3701c55a9a2af8b13a55c1f5f53a16614ca96;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git

diff --git a/admin/print_profiles.php b/admin/print_profiles.php
index 02e3701c..534c5168 100644
--- a/admin/print_profiles.php
+++ b/admin/print_profiles.php
@@ -15,7 +15,7 @@ include($path_to_root . "/includes/session.inc");
 include($path_to_root . "/admin/db/printers_db.inc");
 include($path_to_root . "/includes/ui.inc");
 
-page(_("Printing Profiles"));
+page(_($help_context = "Printing Profiles"));
 
 $selected_id = get_post('profile_id','');
 
@@ -23,41 +23,40 @@ $selected_id = get_post('profile_id','');
 // Returns array of defined reports
 //
 function get_reports() {
-	global $path_to_root, $comp_path, $go_debug;
+	global $path_to_root, $SysPrefs;
 
-if ($go_debug || !isset($_SESSION['reports'])) {	
+	if ($SysPrefs->go_debug || !isset($_SESSION['reports'])) {	
 	// to save time, store in session.
 		$paths = array (
 			$path_to_root.'/reporting/',
-			$comp_path .'/'. user_company() . '/reporting/');
+			company_path(). '/reporting/');
 		$reports = array( '' => _('Default printing destination'));
 
-	foreach($paths as $dirno => $path) {
-		$repdir = opendir($path);
-		while(false !== ($fname = readdir($repdir)))
-		{
-		// reports have filenames in form rep(repid).php 
-		// where repid must contain at least one digit (reports_main.php is not ;)
-			if (is_file($path.$fname) 
-//				&& preg_match('/.*[^0-9]([0-9]+)[.]php/', $fname, $match))
-				&& preg_match('/rep(.*[0-9]+.*)[.]php/', $fname, $match))
+		foreach($paths as $dirno => $path) {
+			$repdir = opendir($path);
+			while(false !== ($fname = readdir($repdir)))
 			{
-				$repno = $match[1];
-				$title = '';
-
-				$line = file_get_contents($path.$fname);
-				if (preg_match('/.*(FrontReport\()\s*_\([\'"]([^\'"]*)/', $line, $match)) {
-					$title = trim($match[2]);
-				}
-				else // for any 3rd party printouts without FrontReport() class use
+				// reports have filenames in form rep(repid).php 
+				// where repid must contain at least one digit (reports_main.php is not ;)
+				if (is_file($path.$fname) 
+					&& preg_match('/rep(.*[0-9]+.*)[.]php/', $fname, $match))
+				{
+					$repno = $match[1];
+					$title = '';
+
+					$line = file_get_contents($path.$fname);
+					if (preg_match('/.*(FrontReport\()\s*_\([\'"]([^\'"]*)/', $line, $match)) {
+						$title = trim($match[2]);
+					}
+					else // for any 3rd party printouts without FrontReport() class use
 					if (preg_match('/.*(\$Title).*[\'"](.*)[\'"].+/', $line, $match)) {
 						$title = trim($match[2]);
 					}
-				$reports[$repno] = $title;
+					$reports[$repno] = $title;
+				}
 			}
+			closedir();
 		}
-	closedir();
-	}
 		ksort($reports);
 		$_SESSION['reports'] = $reports;
 	}
@@ -75,11 +74,9 @@ function clear_form()
 
 function check_delete($name)
 {
-// check if selected profile is used by any user
+	// check if selected profile is used by any user
 	if ($name=='') return 0; // cannot delete system default profile
-	$sql = "SELECT * FROM ".TB_PREF."users WHERE print_profile=".db_escape($name);
-	$res = db_query($sql,'cannot check printing profile usage');
-	return db_num_rows($res);
+	return key_in_foreign_table($name, 'users', 'print_profile');
 }
 //-------------------------------------------------------------------------------------------
 if ( get_post('submit'))
@@ -102,12 +99,12 @@ if ( get_post('submit'))
 			$prof[$rep] = $val;
 		}
 		if ($_POST['profile_id']=='')
-		$_POST['profile_id'] = get_post('name');
+			$_POST['profile_id'] = get_post('name');
 		
 		update_printer_profile($_POST['profile_id'], $prof);
 		if ($selected_id == '') {
 			display_notification_centered(_('New printing profile has been created')); 
-			clear_form();
+			clear_form($selected_id);
 		} else {
 			display_notification_centered(_('Printing profile has been updated'));
 		}
@@ -116,11 +113,11 @@ if ( get_post('submit'))
 
 if(get_post('delete'))
 {
- if (!check_delete(get_post('name'))) {
-	delete_printer_profile($selected_id);
-	display_notification(_('Selected printing profile has been deleted'));
-	clear_form();
- }
+ 	if (!check_delete(get_post('name'))) {
+		delete_printer_profile($selected_id);
+		display_notification(_('Selected printing profile has been deleted'));
+		clear_form();
+ 	}
 }
 
 if(get_post('_profile_id_update')) {
@@ -146,7 +143,7 @@ while ($myrow = db_fetch($result)) {
 	$prints[$myrow['report']] = $myrow['printer'];
 }
 
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Report Id"), _("Description"), _("Printer"));
 table_header($th);
 
@@ -160,7 +157,7 @@ foreach(get_reports() as $rep => $descr)
     label_cell($descr == '' ? '???<sup>1)</sup>' : _($descr));
 	$_POST['Prn'.$rep] = isset($prints[$rep]) ? $prints[$rep] : '';
     echo '<td>';
-	printers_list('Prn'.$rep, null, 
+	echo printers_list('Prn'.$rep, null, 
 		$rep == '' ? _('Browser support') : _('Default'));
 	echo '</td>';
 	if ($descr == '') $unkn = 1;
@@ -186,4 +183,3 @@ div_end();
 end_form();
 end_page();
 
-?>