[PC-BSD Commits] r1505 - in websites/pbidir.com/bibivu: etc lib

[svn at pcbsd.org]

Author: fabry
Date: 2008-03-02 10:47:21 -0800 (Sun, 02 Mar 2008)
New Revision: 1505

Modified:
   websites/pbidir.com/bibivu/etc/cron.conf.php
   websites/pbidir.com/bibivu/lib/pbi.php
Log:
Only a certain type of users can show up on the pbi user assignment.  fixes #106

Modified: websites/pbidir.com/bibivu/etc/cron.conf.php
===================================================================
--- websites/pbidir.com/bibivu/etc/cron.conf.php	2008-03-02 18:11:19 UTC (rev 1504)
+++ websites/pbidir.com/bibivu/etc/cron.conf.php	2008-03-02 18:47:21 UTC (rev 1505)
@@ -1,41 +1,42 @@
-<?php
-/*********************************
- * cron jobs
- *
- * use the same format as unix files
- *
- *		*     *     *     *     *  	command to be executed
- *		-     -     -     -     -
- *		|     |     |     |     |
- *		|     |     |     |     +----- day of week (0 - 6) (Sunday=0)
- *		|     |     |     +------- month (1 - 12)
- *		|     |     +--------- day of month (1 - 31)
- *		|     +----------- hour (0 - 23)
- *		+------------- min (0 - 59)
- *
- *
- * this will execute only the programs that are located into the /etc/periodic/other folder
- * the hourly, daily, weekly, monthly scripts are automatically executed is located into the folder
- * I.E.: to execute "script.php" at the 5th minute of the new year day (January 1st):
- *		5     0     1     1     *	script.php
- *
- * those are samples used to autoscheduled the hourly, daily, weekly, and monthly scripts
-
-$cron['jobs'][] = '0	*	*	*	*	hourly';
-$cron['jobs'][] = '1	0	*	*	*	daily';
-$cron['jobs'][] = '2	1	*	*	0	weekly';
-$cron['jobs'][] = '3	2	1	*	*	monthly';
-$cron['jobs'][] = '4	3	1	1	*	yearly';
-
- ********************************/
-
-$cron['php']		= '/usr/local/bibivu/php/bin/php -q ';	//php path, comment out to use "php"
-
-$cron['hourly']		= '0	*	*	*	*';
-$cron['daily']		= '1	0	*	*	*';
-$cron['weekly']		= '2	1	*	*	0';
-$cron['monthly']	= '3	2	1	*	*';
-$cron['yearly']		= '4	3	1	1	*';
-$cron['jobs'] = array();
-
+<?php
+/*********************************
+ * cron jobs
+ *
+ * use the same format as unix files
+ *
+ *		*     *     *     *     *  	command to be executed
+ *		-     -     -     -     -
+ *		|     |     |     |     |
+ *		|     |     |     |     +----- day of week (0 - 6) (Sunday=0)
+ *		|     |     |     +------- month (1 - 12)
+ *		|     |     +--------- day of month (1 - 31)
+ *		|     +----------- hour (0 - 23)
+ *		+------------- min (0 - 59)
+ *
+ *
+ * this will execute only the programs that are located into the /etc/periodic/other folder
+ * the hourly, daily, weekly, monthly scripts are automatically executed is located into the folder
+ * I.E.: to execute "script.php" at the 5th minute of the new year day (January 1st):
+ *		5     0     1     1     *	script.php
+ *
+ * those are samples used to autoscheduled the hourly, daily, weekly, and monthly scripts
+
+$cron['jobs'][] = '0	*	*	*	*	hourly';
+$cron['jobs'][] = '1	0	*	*	*	daily';
+$cron['jobs'][] = '2	1	*	*	0	weekly';
+$cron['jobs'][] = '3	2	1	*	*	monthly';
+$cron['jobs'][] = '4	3	1	1	*	yearly';
+
+ ********************************/
+
+//$cron['php']		= '/usr/local/bibivu/php/bin/php -q ';	//php path, comment out to use "php"
+$cron['php']		= '/usr/local/bin/php -q ';	//php path, comment out to use "php"
+
+$cron['hourly']		= '0	*	*	*	*';
+$cron['daily']		= '1	0	*	*	*';
+$cron['weekly']		= '2	1	*	*	0';
+$cron['monthly']	= '3	2	1	*	*';
+$cron['yearly']		= '4	3	1	1	*';
+$cron['jobs'] = array();
+
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/lib/pbi.php
===================================================================
--- websites/pbidir.com/bibivu/lib/pbi.php	2008-03-02 18:11:19 UTC (rev 1504)
+++ websites/pbidir.com/bibivu/lib/pbi.php	2008-03-02 18:47:21 UTC (rev 1505)
@@ -144,7 +144,9 @@
 										'image'	=> false,
 								);
 			$filters = array();
-			$filters[] = array('field'=>'status', 'operator'=>'=', 'value'=>'active');
+			$filters[0] = array('field'=>'status', 'operator'=>'=', 'value'=>'active');
+			$filters[1][] = array('field'=>'group_id', 'operator'=>'=', 'value'=>'1');	//root
+			$filters[1][] = array('field'=>'group_id', 'operator'=>'=', 'value'=>'3');	//Maintainer
 			$tmps = $this->get_raw($filters, array('name'),array(), '','user');
 			$values = array();
 			foreach($tmps as $tmp){