Changeset 3172

Timestamp:

08/18/10 09:36:16 (13 years ago)

Author:

asaikawa

Message:

Ticket #993 - Corrigida a utilizacao de algumas constantes e substituidas outras pela settings

Location:

sandbox/workflow/branches/993

Files:

• inc/class.bo_userinterface.inc.php (modified) (9 diffs)
• inc/smarty/wf_plugins/function.wf_calendar_init.php (modified) (1 diff)
• inc/smarty/wf_plugins/function.wf_redir_menu.php (modified) (1 diff)
• lib/settings/Settings.php (modified) (1 diff)

sandbox/workflow/branches/993/inc/class.bo_userinterface.inc.php

@@ -51 +51 @@
         function processes()
         {
-                $account_id = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $account_id = Settings::get('expresso', 'user', 'account_id');
                 $result = $GLOBALS['ajax']->gui->gui_list_user_activities($account_id, '0', '-1', "wf_menu_path__ASC, ga.wf_name__ASC", '', '', '', true, true, true, '');
 
@@ -139 +139 @@
         function inbox($params)
         {
-                $preferences = $_SESSION['phpgw_info']['workflow']['user']['preferences'];
+                $preferences = Settings::get('workflow', 'preferences');
 
                 /* initialize Paging Class */
@@ -170 +170 @@
                 $pid = (int) $params['pid'];
                 $search_term = $params['search_term'];
-                $account_id = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $account_id = Settings::get('expresso', 'user', 'account_id');
                 $result = $GLOBALS['ajax']->gui->gui_list_user_instances($account_id, 0, -1, $sort, $search_term, "ga.wf_is_interactive = 'y'", false, $pid, true, false, true, false, false, false);
 
@@ -328 +328 @@
         function inbox_group()
         {
-                $account_id = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $account_id = Settings::get('expresso', 'user', 'account_id');
                 $result = $GLOBALS['ajax']->gui->gui_list_user_instances($account_id, 0, -1, 'wf_procname__ASC,wf_name__ASC', '', "ga.wf_is_interactive = 'y'", false, 0, true, false, true, false, false, false);
 
@@ -545 +545 @@
         $show_properties = false;
 
-                $current_user_id = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $current_user_id = Settings::get('expresso', 'user', 'account_id');
 
                 /* check if the current user is a process admin */
@@ -609 +609 @@
         function instances($params)
         {
-                $preferences = $_SESSION['phpgw_info']['workflow']['user']['preferences'];
+                $preferences = Settings::get('workflow', 'preferences');
 
                 $lightVersion = ((isset($preferences['use_light_interface']) ? $preferences['use_light_interface'] : 0) == 1);
 
                 /* get some parameters */
-                $userID = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $userID = Settings::get('expresso', 'user', 'account_id');
                 $pid = (int) $params['pid'];
                 $active = ($params['active'] == 1);
@@ -721 +721 @@
                 {
                         /* paginate the result */
-                        $itemsPerPage = isset($_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page']) ? $_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page'] : 15;
+                        $itemsPerPage = isset($preferences['ui_items_per_page']) ? $preferences['ui_items_per_page'] : 15;
                         $paging = Factory::newInstance('Paging', $itemsPerPage, $_POST);
                         $output['instances'] = $paging->restrictItems($output['instances']);
@@ -774 +774 @@
         private function checkOrgchartAccess()
         {
-                $this->organizationInfo = $this->so->getUserOrganization($_SESSION['phpgw_info']['workflow']['account_id']);
+                $this->organizationInfo = $this->so->getUserOrganization(Settings::get('expresso', 'user', 'account_id'));
                 if ($this->organizationInfo === false)
                         return array('warning' => 'Você não está cadastrado em nenhuma organização');
@@ -1069 +1069 @@
                 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP);
 
-                $entry = $cachedLDAP->getEntryByID( $_SESSION['phpgw_info']['workflow']['account_id'] );
+                $entry = $cachedLDAP->getEntryByID(Settings::get('expresso', 'user', 'account_id'));
                 if ( $entry && ! is_null($entry['telephonenumber']) )
                         $fromNumber = $entry['telephonenumber'];

sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_calendar_init.php

@@ -21 +21 @@
                 $path = $params['path'] . "/";
         else
-                $path = WF_SERVER_URL . SEP . 'js' . SEP . 'jscalendar' . SEP;
+                $path = WF_BASE_URL . SEP . 'js' . SEP . 'jscalendar' . SEP;
         $defaults = array(
                 'css' => $path . 'calendar-blue.css',

sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_redir_menu.php

@@ -30 +30 @@
                 $$extract = $params[$extract];
 
-    $base_url = EGW_BASAE_URL;
+    $base_url = EGW_BASE_URL;
         $user_activities = $GLOBALS['workflow']['wf_user_activities']['data'];
         $pid = $GLOBALS['workflow']['wf_process_id'];

sandbox/workflow/branches/993/lib/settings/Settings.php

@@ -254 +254 @@
                 self::$_configs['workflow']['preferences']['ui_items_per_page'] = $GLOBALS['phpgw_info']['user']['preferences']['workflow']['ui_items_per_page'];
                 self::$_configs['workflow']['preferences']['show_activity_complete_page'] = $GLOBALS['phpgw_info']['user']['preferences']['workflow']['show_activity_complete_page'];
+                self::$_configs['workflow']['preferences']['common']['template_set'] = $GLOBALS['phpgw_info']['server']['template_set'];
 
                 self::$_configs['workflow']['app']['title'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'];