[Phpgroupware-cvs] CVS: etemplate/inc class.db_tools.inc.php,1.13,1.14 class.select_widget.inc.php,1.4,1.5

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv31247

Modified Files:
        class.db_tools.inc.php class.select_widget.inc.php 
Log Message:
db-tools now show uninstalled apps to, thanks to new select-application widget

Index: class.db_tools.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.db_tools.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.db_tools.inc.php      17 Mar 2003 20:54:05 -0000      1.13
--- class.db_tools.inc.php      18 Mar 2003 13:06:27 -0000      1.14
***************
*** 31,35 ****
                var $messages = array(
                        'not_found' => 'Not found !!!',
-                       'select_one' => 'Select one ...',
                        'writen' => 'File writen',
                        'error_writing' => 'Error: writing file (no 
write-permission for the webserver) !!!',
--- 31,34 ----
***************
*** 82,91 ****
                                
ExecMethod('phpgwapi.applications.read_installed_apps');
                        }
-                       $this->apps = array();
-                       reset($GLOBALS['phpgw_info']['apps']);
-                       while (list($name,$data) = 
each($GLOBALS['phpgw_info']['apps']))
-                       {
-                               $this->apps[$name] = $data['title'];
-                       }
                        if ($lang_on_messages)
                        {
--- 81,84 ----
***************
*** 228,233 ****
                        $sel_options = array(
                                'table_name' => $table_names,
!                               'type' => $this->types,
!                               'app' => array('' => 
$this->messages['select_one']) + $this->apps
                        );
                        if ($this->table != '' && 
isset($this->data[$this->table]))
--- 221,225 ----
                        $sel_options = array(
                                'table_name' => $table_names,
!                               'type' => $this->types
                        );
                        if ($this->table != '' && 
isset($this->data[$this->table]))

Index: class.select_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.select_widget.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.select_widget.inc.php 12 Oct 2002 20:40:18 -0000      1.4
--- class.select_widget.inc.php 18 Mar 2003 13:06:27 -0000      1.5
***************
*** 36,40 ****
                        'select-year'     => 'Select Year',
                        'select-month'    => 'Select Month',
!                       'select-day'      => 'Select Day'
                );
                var $monthnames = array(
--- 36,41 ----
                        'select-year'     => 'Select Year',
                        'select-month'    => 'Select Month',
!                       'select-day'      => 'Select Day',
!                       'select-app'      => 'Select Application'
                );
                var $monthnames = array(
***************
*** 474,477 ****
--- 475,512 ----
                                        }
                                        $cell['no_lang'] = True;
+                                       break;
+                                       
+                               case 'select-app':      // type2: ''=users 
enabled apps, 'installed', 'all' = not installed ones too
+                                       $apps = array();
+                                       foreach ($GLOBALS['phpgw_info']['apps'] 
as $app => $data)
+                                       {
+                                               if (!$type2 || 
$GLOBALS['phpgw_info']['user']['apps'][$app])
+                                               {
+                                                       $apps[$app] = 
$data['title'] ? $data['title'] : lang($app);
+                                               }
+                                       }
+                                       if ($type2 == 'all')
+                                       {
+                                               $dir = 
opendir(PHPGW_SERVER_ROOT);
+                                               while ($file = readdir($dir))
+                                               {
+                                                       if 
(@is_dir(PHPGW_SERVER_ROOT."/$file/setup") && $file[0] != '.' &&
+                                                           !isset($apps[$app = 
basename($file)]))
+                                                       {
+                                                               $apps[$app] = 
$app . ' (*)';
+                                                       }
+                                               }
+                                               closedir($dir);
+                                       }
+                                       $apps_lower = $apps;    // 
case-in-sensitve sort
+                                       foreach ($apps_lower as $app => $title)
+                                       {
+                                               $apps_lower[$app] = 
strtolower($title);
+                                       }
+                                       asort($apps_lower);
+                                       foreach ($apps_lower as $app => $title)
+                                       {
+                                               $cell['sel_options'][$app] = 
$apps[$app];
+                                       }
                                        break;
                        }