Changeset 5129 for trunk

Timestamp:

11/03/11 10:15:37 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo API.

Location:

trunk/preferences

Files:

• inc/class.uicategories.inc.php (modified) (1 diff)
• preferences.php (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (previous)
• setup/setup.inc.php (modified) (2 diffs)
• templates/default/index.tpl (modified) (2 diffs)

trunk/preferences/inc/class.uicategories.inc.php

@@ -97 +97 @@
                         $cats_level  = get_var('cats_level',array('GET','POST'));
 
+                        $this->bo->query = get_var('query',array('GET','POST'));
+                        $this->bo->order = get_var('order',array('GET','POST'));
+                        $this->bo->start = get_var('start',array('GET','POST'));
+                        $this->bo->sort  = get_var('sort',array('GET','POST'));
+                        $this->query = get_var('query',array('GET','POST'));
+                        $this->order = get_var('order',array('GET','POST'));
+                        $this->start = get_var('start',array('GET','POST'));
+                        $this->sort  = get_var('sort',array('GET','POST'));
+                        $GLOBALS['query'] = get_var('query',array('GET','POST'));
+
                         $link_data = array
                         (

trunk/preferences/preferences.php

@@ -616 +616 @@
         }
         $t->pfp('phpgw_body','preferences');
-        
         //echo '<pre style="text-align: left;">'; print_r($GLOBALS['phpgw']->preferences->data); echo "</pre>\n";
-        
         $GLOBALS['phpgw']->common->phpgw_footer();
+        if($GLOBALS['type'] == 'forced' && is_admin())
+        {
+                if($_POST['submit']){
+                        header("Location: ".$_SERVER['PHP_SELF'].'?appname=' . $_GET['appname']. "&type=forced");
+                }
+        }
 ?>

trunk/preferences/setup/setup.inc.php

@@ -13 +13 @@
         $setup_info['preferences']['name']      = 'preferences';
         $setup_info['preferences']['title']     = 'Preferences';
-        $setup_info['preferences']['version']   = '2.2.1';
+        $setup_info['preferences']['version']   = '2.4.0';
         $setup_info['preferences']['app_order'] = 1;
         $setup_info['preferences']['tables']    = '';
@@ -28 +28 @@
         $setup_info['preferences']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('2.2')
+                'versions' => Array('2.4.0')
         );
 ?>

trunk/preferences/templates/default/index.tpl

@@ -1 +1 @@
 <!-- BEGIN list -->
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<table border="0" width="75%" cellspacing="0" cellpadding="0">
  <tr>
   <td align="left">{tabs}</td>
@@ -6 +6 @@
 </table>
 
-<table width="75%" border="0" cellspacing="0" cellpadding="0" class="prefTable">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" class="prefTable">
  {rows}
 </table>