Changeset 3060 for sandbox/workflow/trunk/inc
- Timestamp:
- 07/15/10 17:30:07 (14 years ago)
- Location:
- sandbox/workflow/trunk/inc
- Files:
-
- 24 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
sandbox/workflow/trunk/inc/class.WorkflowLDAP.inc.php
r2372 r3060 377 377 * @access public 378 378 */ 379 function getUsers($context) 380 { 381 $filter = '(&(phpgwaccounttype=u)(!(phpgwAccountVisible=-1)))'; 379 function getUsers($context, $onlyVisibleAccounts = true) 380 { 381 $filter = '(phpgwaccounttype=u)'; 382 if($onlyVisibleAccounts) 383 $filter = '(&' . $filter . '(!(phpgwAccountVisible=-1)))'; 384 382 385 $elements = array('uidnumber', 'cn', 'mail'); 383 386 return $this->getEntities($context, $filter, $elements, 'u', false); … … 561 564 * @access public 562 565 */ 563 function search($searchTerm, $includeUsers = true, $includeGroups = false, $includeLists = false, $context = null )566 function search($searchTerm, $includeUsers = true, $includeGroups = false, $includeLists = false, $context = null, $onlyVisibleAccounts = true) 564 567 { 565 568 if (!($includeUsers || $includeGroups || $includeLists)) … … 586 589 $entityFilter = $entityFilter[0]; 587 590 588 $filter = "(&{$entityFilter}(cn={$searchTerm})(!(phpgwAccountVisible=-1)))"; 591 if($onlyVisibleAccounts) 592 $filter = "(&{$entityFilter}(cn={$searchTerm})(!(phpgwAccountVisible=-1)))"; 593 else 594 $filter = "(&{$entityFilter}(cn={$searchTerm}))"; 595 589 596 $resourceIdentifier = ldap_search($this->dataSource, $context, $filter, array('cn', 'uidnumber', 'gidnumber', 'phpgwaccounttype', 'mail')); 590 597 ldap_sort($this->dataSource, $resourceIdentifier, 'cn'); -
sandbox/workflow/trunk/inc/class.basemodel.inc.php
r795 r3060 167 167 * @param string $obj Class name 168 168 * @return mixed 169 * @deprecated 169 * @deprecated 2.2.00.000 170 170 * @access public 171 171 */ 172 172 function &getInstance($obj) 173 { 173 { 174 wf_warn_deprecated_method('Factory', 'getInstance'); 174 175 return(wf_create_object(strtolower($obj))); 175 176 } -
sandbox/workflow/trunk/inc/class.bo_participants.inc.php
r2372 r3060 74 74 { 75 75 $preffix = ($usePreffix) ? 'u' : ''; 76 $ents = $this->ldap->getUsers($params['context'] );76 $ents = $this->ldap->getUsers($params['context'], $params['onlyVisibleAccounts']); 77 77 foreach ($ents as $ent) 78 78 $output[$preffix . $ent[$id]] = $ent['name']; … … 162 162 $searchLists = (strpos($entities, 'l') !== false); 163 163 164 $onlyVisibleAccounts = $params['onlyVisibleAccounts']; 165 164 166 /* faz a busca */ 165 167 $output = array(); 166 $output['participants'] = $this->ldap->search($searchTerm, $searchUsers, $searchGroups, $searchLists );168 $output['participants'] = $this->ldap->search($searchTerm, $searchUsers, $searchGroups, $searchLists, null, $onlyVisibleAccounts); 167 169 168 170 /* limita os resultados e define uma mensagem que será exibida */ -
sandbox/workflow/trunk/inc/class.bo_userinterface.inc.php
r2372 r3060 91 91 $recset[$procname_ver]['useHTTPS'] = 0; 92 92 } 93 $recset[$procname_ver][] = array('wf_activity_id' => $line['wf_activity_id'], 94 'wf_name' => $line['wf_name'], 95 'wf_menu_path' => $line['wf_menu_path'], 96 'wf_type' => $line['wf_type'], 97 'wf_is_autorouted' => $line['wf_is_autorouted'], 98 'wf_is_interactive' => $line['wf_is_interactive']); 93 if (!is_dir(GALAXIA_PROCESSES . '/' . $line['wf_normalized_name'])) 94 { 95 $recset[$procname_ver]['wf_iconfile'] = $templateServer->generateImageLink('navbar_nocode.png'); 96 } 97 else 98 { 99 $recset[$procname_ver][] = array('wf_activity_id' => $line['wf_activity_id'], 100 'wf_name' => $line['wf_name'], 101 'wf_menu_path' => $line['wf_menu_path'], 102 'wf_type' => $line['wf_type'], 103 'wf_is_autorouted' => $line['wf_is_autorouted'], 104 'wf_is_interactive' => $line['wf_is_interactive']); 105 } 99 106 } 100 107 -
sandbox/workflow/trunk/inc/class.bo_utils.inc.php
r2372 r3060 64 64 */ 65 65 function search_ldap_users_by_cn($params) 66 { 66 { 67 67 // parâmetro a ser procurado no ldap 68 68 $cn = trim(ereg_replace(' +', ' ', $params['cn'])); … … 86 86 $ret_name = empty($params['name']) ? 'cn' : $params['name']; 87 87 88 $ret_complement = empty($params['complement']) ? '' : $params['complement']; 89 88 90 $ajaxConfig = &Factory::newInstance('ajax_config', 'contactcenter'); 89 91 $config = $ajaxConfig->read_repository(); … … 103 105 104 106 $filter = '(&(uid=*)(phpgwAccountType=u)(!(phpgwAccountVisible=-1))(cn=*' . $cn . '*))'; 105 $attrib_ret = array('cn', $ret_id, $ret_name); 107 108 if($ret_complement != '') 109 $attrib_ret = array('cn', $ret_id, $ret_name, $ret_complement); 110 else 111 $attrib_ret = array('cn', $ret_id, $ret_name); 106 112 107 113 $r = ldap_search($ds, $ldapconfig['basedn'], $filter, $attrib_ret, 0, 0, 5); … … 112 118 } 113 119 elseif(ldap_count_entries($ds, $r) < 200){ 120 114 121 $result = ldap_get_entries($ds, $r); 115 foreach($result as $value){ 116 $output['values'][] = array( 117 'id' => $value[$ret_id], 118 'name' => trim(ucwords(strtolower($value[$ret_name][0])))); 122 123 foreach($result as $value){ 124 if( ($value[$ret_name][0] != '') && ($value[$ret_complement][0] != '') ){ 125 $complement = " >> " . $value[$ret_complement][0]; 126 $output['values'][] = array( 127 'id' => $value[$ret_id], 128 'name' => trim(ucwords(strtolower($value[$ret_name][0]))) . $complement 129 ); 130 131 } 132 elseif($value[$ret_name][0] != ''){ 133 $output['values'][] = array( 134 'id' => $value[$ret_id], 135 'name' => trim(ucwords(strtolower($value[$ret_name][0]))) 136 ); 137 } 138 else{ 139 $output['values'][] = array( 140 'id' => '', 141 'name' => "-- Selecione uma Opção --" 142 ); 143 } 144 119 145 } 120 121 146 122 147 foreach ($output['values'] as $key => $value){ … … 140 165 else{ 141 166 $output['msg'] = 'Não digite caracteres especiais nem números. Apenas letras e espaços são permitidos.'; 142 } 167 } 143 168 return $output; 144 169 } -
sandbox/workflow/trunk/inc/class.so_move_instances.inc.php
r2466 r3060 318 318 } 319 319 320 /* format the array elements for use in a SELECT SQL statement, e.g. [iid => 12, aid = 27] would produce (12, 27) */321 $instanceActivityList = array_map(create_function('$e', 'return \'(\' . $e[\'iid\'] . \', \' . $e[\'aid\'] . \')\';'), $instanceActivityList);322 323 /* update the interinstance relations of the modified rows of the instance_activities table */324 $resultSet = $this->db->query("SELECT wf_parent_instance_id, wf_parent_activity_id FROM egw_wf_interinstance_relations WHERE ((wf_parent_instance_id, wf_parent_activity_id) IN (" . implode(', ', $instanceActivityList) . "))");325 $rows = $resultSet->GetArray(-1);326 if (is_array($rows))327 {328 foreach ($rows as $row)329 {330 /* update the activity ID */331 if (!$this->db->query("UPDATE egw_wf_interinstance_relations SET wf_parent_activity_id = ? WHERE (wf_parent_instance_id = ?) AND (wf_parent_activity_id = ?)", array($activitiesConvert[$row['wf_parent_activity_id']], $row['wf_parent_instance_id'], $row['wf_parent_activity_id'])))332 {333 $this->db->FailTrans();334 return array('error' => 'Erro atualizando a tabela de relacionamento inter-instância. Nenhuma modificação foi salva');335 }336 }337 }338 339 320 /* in case of success, commit the modifications */ 340 321 $this->db->CompleteTrans(); -
sandbox/workflow/trunk/inc/class.ui_adminactivities.inc.php
r2372 r3060 1035 1035 $image_name = $proc_info['wf_normalized_name'] . SEP . 'graph' . SEP . $proc_info['wf_normalized_name'] . '.png'; 1036 1036 $image = GALAXIA_PROCESSES . SEP . $image_name; 1037 if (Factory::getInstance('BrowserInfo')->isOpera()) 1038 $maximumDimension = 1000000; 1037 if (file_exists($image)) 1038 { 1039 if (Factory::getInstance('BrowserInfo')->isOpera()) 1040 $maximumDimension = 1000000; 1041 else 1042 $maximumDimension = 2500; 1043 1044 $dims = getimagesize($image); 1045 list($originalWidth, $originalHeight) = $dims; 1046 1047 /* the image must be resized */ 1048 if (max($originalWidth, $originalHeight) > $maximumDimension) 1049 { 1050 /* define the new width and height */ 1051 $newWidth = $newHeight = $maximumDimension; 1052 if ($originalWidth > $originalHeight) 1053 $newHeight = $maximumDimension * ($originalHeight / $originalWidth); 1054 else 1055 $newWidth = $maximumDimension * ($originalWidth / $originalHeight); 1056 1057 /* create the new image and send to the browser */ 1058 $smallerImage = imagecreatetruecolor($newWidth, $newHeight); 1059 imagecopyresampled($smallerImage, imagecreatefrompng($image), 0, 0, 0, 0, $newWidth, $newHeight, $originalWidth, $originalHeight); 1060 header('content-disposition: inline; filename=' . $image_name); 1061 header('content-type: ' . $dims['mime']); 1062 imagepng($smallerImage); 1063 } 1064 else 1065 { 1066 header('content-disposition: inline; filename=' . $image_name); 1067 header('content-type: ' . $dims['mime']); 1068 header('content-length: ' . filesize($image)); 1069 readfile($image); 1070 } 1071 } 1072 // if there is no graph, show "graph not found" message 1039 1073 else 1040 $maximumDimension = 2500; 1041 1042 $dims = getimagesize($image); 1043 list($originalWidth, $originalHeight) = $dims; 1044 1045 /* the image must be resized */ 1046 if (max($originalWidth, $originalHeight) > $maximumDimension) 1047 { 1048 /* define the new width and height */ 1049 $newWidth = $newHeight = $maximumDimension; 1050 if ($originalWidth > $originalHeight) 1051 $newHeight = $maximumDimension * ($originalHeight / $originalWidth); 1052 else 1053 $newWidth = $maximumDimension * ($originalWidth / $originalHeight); 1054 1055 /* create the new image and send to the browser */ 1056 $smallerImage = imagecreatetruecolor($newWidth, $newHeight); 1057 imagecopyresampled($smallerImage, imagecreatefrompng($image), 0, 0, 0, 0, $newWidth, $newHeight, $originalWidth, $originalHeight); 1058 header('content-disposition: inline; filename=' . $image_name); 1059 header('content-type: ' . $dims['mime']); 1060 imagepng($smallerImage); 1061 } 1062 else 1063 { 1064 header('content-disposition: inline; filename=' . $image_name); 1065 header('content-type: ' . $dims['mime']); 1066 header('content-length: ' . filesize($image)); 1067 readfile($image); 1074 { 1075 header ('Content-type: image/png'); 1076 $text = 'GRAFICO NAO ENCONTRADO'; 1077 $font_size = 5; 1078 $width = imagefontwidth($font_size) * strlen($text); 1079 $height = imagefontheight($font_size); 1080 $im = imagecreate($width, $height); 1081 $text_color = imagecolorallocate($im, 0, 0, 0); // black 1082 $bg_color = imagecolorallocate($im, 255, 255, 255); // white 1083 imagefill($im, 0, 0, $bg_color); 1084 imagestring($im, $font_size, 0, 0, $text, $text_color); 1085 imagepng($im); 1086 imagedestroy($im); 1068 1087 } 1069 1088 } -
sandbox/workflow/trunk/inc/class.ui_adminroles.inc.php
r2858 r3060 276 276 $entry = $cachedLDAP->getEntryByID($mapping['wf_user']); 277 277 $cname = $GLOBALS['phpgw']->translation->convert($entry['cn'],'utf-8'); 278 $glabel = "";278 $glabel = (!empty($entry['uid'])) ? '[' . $entry['uid'] . ']' : ''; 279 279 if (is_null($entry['last_update'])) 280 280 $glabel = '<font color="red">(inativo)</font>'; -
sandbox/workflow/trunk/inc/class.ui_participants.inc.php
r2372 r3060 92 92 $hideSectors = ($_REQUEST['hideSectors'] == '1') ? true : false; 93 93 94 // the default value of $onlyVisibleAccounts is true 95 if((isset($_REQUEST['onlyVisibleAccounts'])) && (empty($_REQUEST['onlyVisibleAccounts']) || $_REQUEST['onlyVisibleAccounts'] === 'false')) 96 $onlyVisibleAccounts = false; 97 else 98 $onlyVisibleAccounts = true; 99 94 100 /* define the initial organization */ 95 101 $selectedOrganization = $ldap->getOrganizationFromDN($userDN); … … 117 123 $smarty->assign('organizations', $organizationList); 118 124 $smarty->assign('selectedOrganization', $selectedOrganization); 119 $smarty->assign('sectors', $this->bo->getSectors(array('organization' => $selectedOrganization ), true));125 $smarty->assign('sectors', $this->bo->getSectors(array('organization' => $selectedOrganization, 'onlyVisibleAccounts' => $onlyVisibleAccounts), true)); 120 126 $smarty->assign('selectedSector', $selectedSector); 121 $smarty->assign('participants', $this->bo->getEntities(array('entities' => $entities, 'id' => $id, 'context' => $selectedSector, ' usePreffix' => $usePreffix), true));127 $smarty->assign('participants', $this->bo->getEntities(array('entities' => $entities, 'id' => $id, 'context' => $selectedSector, 'onlyVisibleAccounts' => $onlyVisibleAccounts, 'usePreffix' => $usePreffix), true)); 122 128 $smarty->assign('entities', $entities); 123 129 $smarty->assign('id', $id); … … 126 132 $smarty->assign('hideOrganizations', $hideOrganizations); 127 133 $smarty->assign('hideSectors', $hideSectors); 134 $smarty->assign('onlyVisibleAccounts', $onlyVisibleAccounts); 128 135 $smarty->assign('header', $smarty->expressoHeader); 129 136 $smarty->assign('txt_loading', lang("loading")); -
sandbox/workflow/trunk/inc/class.workflow_processmanager.inc.php
r2372 r3060 226 226 fclose($fp); 227 227 $out.=' ]]></code>'; 228 if($res['wf_is_interactive']=='y') {229 $out.=' <template><![CDATA[';230 $fp=fopen(GALAXIA_PROCESSES.SEP."$wf_procname".SEP."code".SEP."templates".SEP."$name.tpl","r");231 //while(!feof($fp)) {232 // $line=fread($fp,8192);233 $out.=''; //all templatess will be exported in another section234 //}235 fclose($fp);236 $out.=' ]]></template>';237 }238 228 $out.=' </activity>'."\n"; 239 229 } -
sandbox/workflow/trunk/inc/common.inc.php
r2466 r3060 70 70 require_once WF_LIB_ROOT . 'factory/WorkflowFactory.php'; 71 71 require_once WF_LIB_ROOT . 'factory/ProcessFactory.php'; 72 require_once WF_INC_ROOT . 'common_functions.inc.php'; 72 73 ?> -
sandbox/workflow/trunk/inc/engine/src/API/BaseActivity.php
r2372 r3060 84 84 * Seems to be the rest of a bad object architecture 85 85 * 86 * @deprecated 86 * @deprecated 2.2.00.000 87 87 */ 88 88 function setDb(&$db) 89 89 { 90 wf_warn_deprecated_method(); 90 91 $this->db =& $db; 91 92 } … … 550 551 * e.g. $isadmin = $activity->checkUserRole($user,'admin') 551 552 * 552 * @deprecated Unused function. Old API, do not use it. Return always false553 * @deprecated 2.2.00.000 - Unused function. Old API, do not use it. Return always false 553 554 */ 554 555 function checkUserRole($user,$rolename) 555 556 { 557 wf_warn_deprecated_method(); 556 558 $this->error[] = 'use of an old deprecated function checkUserRole, return always false'; 557 559 return false; -
sandbox/workflow/trunk/inc/engine/src/API/Instance.php
r2886 r3060 84 84 */ 85 85 var $parentLock = false; 86 /**87 * @var int $parentActivityId The activity ID of the parent instance88 * @access public89 */90 var $parentActivityId;91 86 /** 92 87 * @var int $parentInstanceId The instance ID of the parent instance … … 490 485 return ''; 491 486 } 492 487 493 488 /** 494 489 * Creates a new instance. … … 503 498 function _createNewInstance($activityId,$user) { 504 499 // Creates a new instance setting up started, ended, user, status and owner 505 $pid = $this->getOne(' select wf_p_id from '.GALAXIA_TABLE_PREFIX.'activities wherewf_activity_id=?',array((int)$activityId));500 $pid = $this->getOne('SELECT wf_p_id FROM '.GALAXIA_TABLE_PREFIX.'activities WHERE wf_activity_id=?',array((int)$activityId)); 506 501 $this->pId = $pid; 507 502 $this->setStatus('active'); … … 515 510 $iid=$this->instanceId; 516 511 517 $query = 'insert into '.GALAXIA_TABLE_PREFIX.'instances 518 (wf_instance_id, wf_started,wf_ended,wf_status,wf_p_id,wf_owner,wf_properties) 519 values(?,?,?,?,?,?,?)'; 520 521 $this->query($query,array((int)$iid, $now,0,'active',$pid,$user,$this->security_cleanup(Array(),false))); 522 512 $query = 'INSERT INTO '.GALAXIA_TABLE_PREFIX.'instances 513 (wf_instance_id, wf_started,wf_ended,wf_status,wf_p_id,wf_owner,wf_properties) 514 VALUES 515 (?,?,?,?,?,?,?)'; 516 517 $this->query($query,array((int)$iid, $now,0,'active',$pid,$user,$this->security_cleanup(Array(),false))); 518 523 519 // Then add in ".GALAXIA_TABLE_PREFIX."instance_activities an entry for the 524 520 // activity the user and status running and started now 525 $query = 'insert into '.GALAXIA_TABLE_PREFIX.'instance_activities (wf_instance_id,wf_activity_id,wf_user, 526 wf_started,wf_status) values(?,?,?,?,?)'; 521 $query = 'INSERT INTO '.GALAXIA_TABLE_PREFIX.'instance_activities 522 (wf_instance_id,wf_activity_id,wf_user,wf_started,wf_status) 523 VALUES 524 (?,?,?,?,?)'; 527 525 $this->query($query,array((int)$iid,(int)$activityId,$user,(int)$now,'running')); 528 526 529 527 if (($this->isChildInstance) && (!is_null($this->parentInstanceId))) 530 528 { 531 $query = 'INSERT INTO '.GALAXIA_TABLE_PREFIX.'interinstance_relations(wf_parent_instance_id, wf_parent_activity_id, wf_child_instance_id, wf_parent_lock) VALUES(?,?,?,?)'; 532 $this->query($query,array((int) $this->parentInstanceId, (int) $this->parentActivityId, (int) $iid, (int) (($this->parentLock) ? 1 : 0))); 533 } 534 529 $query = 'INSERT INTO '.GALAXIA_TABLE_PREFIX.'interinstance_relations 530 (wf_parent_instance_id, wf_child_instance_id, wf_parent_lock) 531 VALUES 532 (?,?,?)'; 533 $this->query($query,array((int) $this->parentInstanceId, (int) $iid, (int) (($this->parentLock) ? 1 : 0))); 534 } 535 535 536 //update database with other datas stored in the object 536 537 return $this->sync(); 537 538 } 538 539 539 540 /** 540 541 * Sets the name of this instance … … 1142 1143 return $this->__activity_completed; 1143 1144 } 1144 1145 1145 1146 /** 1146 1147 * This function can be called by the instance object himself (for automatic activities) 1147 * or by the WfRuntime object. In interactive activities code users use complete() --without args-- 1148 * which refer to the WfRuntime->complete() function which call this one. 1148 * or by the WfRuntime object. In interactive activities code users use complete() --without args-- 1149 * which refer to the WfRuntime->complete() function which call this one. 1149 1150 * In non-interactive activities a call to a complete() will generate errors because the engine 1150 1151 * does it his own way as I said first. … … 1162 1163 { 1163 1164 //$this->db-> 1164 $result = $this->query("SELECT 1 FROM " . GALAXIA_TABLE_PREFIX . "instances i, " . GALAXIA_TABLE_PREFIX . "interinstance_relations ir WHERE (ir.wf_child_instance_id = i.wf_instance_id) AND (i.wf_status IN ('active', 'exception')) AND (ir.wf_parent_lock = 1) AND (ir.wf_parent_instance_id = ?) AND (ir.wf_parent_activity_id = ?)", array($this->instanceId, $activityId));1165 $result = $this->query("SELECT 1 FROM " . GALAXIA_TABLE_PREFIX . "instances i, " . GALAXIA_TABLE_PREFIX . "interinstance_relations ir WHERE (ir.wf_child_instance_id = i.wf_instance_id) AND (i.wf_status IN ('active', 'exception')) AND (ir.wf_parent_lock = 1) AND (ir.wf_parent_instance_id = ?)", array($this->instanceId)); 1165 1166 if ($result->numRows() > 0) 1166 1167 die("Esta instância está aguardando que outras instâncias, das quais depende, sejam finalizadas."); … … 1170 1171 //The complete() is in a transaction, it will be completly done or not at all 1171 1172 $this->db->StartTrans(); 1172 1173 1173 1174 //lock rows and ensure access is granted 1174 1175 if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity'); -
sandbox/workflow/trunk/inc/engine/src/ProcessMonitor/ProcessMonitor.php
r2372 r3060 59 59 60 60 /** 61 * @deprecated 61 * @deprecated 2.2.00.000 62 62 */ 63 63 function update_instance_status($iid,$status) { 64 wf_warn_deprecated_method(); 64 65 return; 65 66 $query = "update `".GALAXIA_TABLE_PREFIX."instances` set `wf_status`=? where `wf_instance_id`=?"; … … 69 70 70 71 /** 71 * @deprecated 72 * @deprecated 2.2.00.000 72 73 */ 73 74 function update_instance_activity_status($iid,$activityId,$status) { 75 wf_warn_deprecated_method(); 74 76 return; 75 77 $query = "update `".GALAXIA_TABLE_PREFIX."instance_activities` set `wf_status`=? where `wf_instance_id`=? and `wf_activity_id`=?"; -
sandbox/workflow/trunk/inc/engine/src/common/WfRuntime.php
r2858 r3060 1089 1089 $run_activity = Factory::newInstance('run_activity'); 1090 1090 $run_activity->runtime->instance->parentInstanceId = $this->instance_id; 1091 $run_activity->runtime->instance->parentActivityId = $this->activity_id;1092 1091 $output = $run_activity->goChildInstance($activityID, $properties, $user, $parentLock); 1093 1092 $_REQUEST['iid'] = $iid; … … 1128 1127 function getParent() 1129 1128 { 1130 $resultSet = $this->query("SELECT wf_parent_instance_id, wf_parent_ activity_id, wf_parent_lock FROM egw_wf_interinstance_relations WHERE (wf_child_instance_id = ?)", array($this->getInstanceId()));1129 $resultSet = $this->query("SELECT wf_parent_instance_id, wf_parent_lock FROM egw_wf_interinstance_relations WHERE (wf_child_instance_id = ?)", array($this->getInstanceId())); 1131 1130 if (($row = $resultSet->fetchRow())) 1132 return array('instance_id' => $row['wf_parent_instance_id'], ' activity_id' => $row['wf_parent_activity_id'], 'lock' => ($row['wf_parent_lock'] == 1));1131 return array('instance_id' => $row['wf_parent_instance_id'], 'lock' => ($row['wf_parent_lock'] == 1)); 1133 1132 else 1134 1133 return false; -
sandbox/workflow/trunk/inc/local/classes/class.wf_engine.php
r2858 r3060 86 86 * @return bool true caso a instância tenha sido continuada e false caso contrário. 87 87 * @access public 88 * @deprecated 1.7.00.00088 * @deprecated 2.2.00.000 89 89 */ 90 90 function continueInstance($activityID, $instanceID) 91 91 { 92 wf_warn_deprecated_method('wf_instance', 'continueInstance'); 92 93 $WFInstance = &Factory::getInstance('wf_instance'); 93 94 return $WFInstance->continueInstance($activityID, $instanceID); … … 99 100 * @return boolean true se foi possível abortar a instância e false caso contrário. 100 101 * @access public 101 * @deprecated 1.7.00.000102 * @deprecated 2.2.00.000 102 103 */ 103 104 function abortInstance($instanceID) 104 105 { 106 wf_warn_deprecated_method('wf_instance', 'abort'); 105 107 $WFInstance = &Factory::getInstance('wf_instance'); 106 108 return $WFInstance->abort($instanceID); … … 113 115 * @return boolean true se foi possível mudar o nome da instância e false caso contrário. 114 116 * @access public 115 * @deprecated 1.7.00.000117 * @deprecated 2.2.00.000 116 118 */ 117 119 function setInstanceName($instanceID, $name) 118 120 { 121 wf_warn_deprecated_method('wf_instance', 'setName'); 119 122 $WFInstance = &Factory::getInstance('wf_instance'); 120 123 return $WFInstance->setName($instanceID, $name); … … 127 130 * @return boolean true se foi possível mudar a prioridade da instância e false caso contrário. 128 131 * @access public 129 * @deprecated 1.7.00.000132 * @deprecated 2.2.00.000 130 133 */ 131 134 function setInstancePriority($instanceID, $priority) 132 135 { 136 wf_warn_deprecated_method('wf_instance', 'setPriority'); 133 137 $WFInstance = &Factory::getInstance('wf_instance'); 134 138 return $WFInstance->setPriority($instanceID, $priority); … … 141 145 * @return array As instâncias que satisfazem o critério de seleção. 142 146 * @access public 143 * @deprecated 1.7.00.000147 * @deprecated 2.2.00.000 144 148 */ 145 149 function getIdleInstances($numberOfDays, $activities = null) 146 150 { 151 wf_warn_deprecated_method('wf_instance', 'getIdle'); 147 152 $WFInstance = &Factory::getInstance('wf_instance'); 148 153 return $WFInstance->getIdle($numberOfDays, $activities); … … 154 159 * @return array As instâncias que satisfazem o critério de seleção. 155 160 * @access public 156 * @deprecated 1.7.00.000161 * @deprecated 2.2.00.000 157 162 */ 158 163 function getInstances($activities = null) 159 164 { 165 wf_warn_deprecated_method('wf_instance', 'getIdle'); 160 166 return $this->getIdleInstances(0, $activities); 161 167 } … … 166 172 * @return array As instâncias que satisfazem o critério de seleção. 167 173 * @access public 168 * @deprecated 1.7.00.000174 * @deprecated 2.2.00.000 169 175 */ 170 176 function getInstancesByName($name) 171 177 { 178 wf_warn_deprecated_method('wf_instance', 'getByName'); 172 179 $WFInstance = &Factory::getInstance('wf_instance'); 173 180 $preOutput = $WFInstance->getByName($name); … … 187 194 * @return array As instâncias filhas do par instância/atividade atual 188 195 * @access public 189 * @deprecated 1.7.00.000196 * @deprecated 2.2.00.000 190 197 */ 191 198 function getChildInstances($instanceID = null, $activityID = null) 192 199 { 200 wf_warn_deprecated_method('wf_instance', 'getChildren'); 193 201 $WFInstance = &Factory::getInstance('wf_instance'); 194 202 $preOutput = $WFInstance->getChildren($instanceID); … … 206 214 * @return mixed Uma array contento as propriedades da instância (no formato "nome_da_propriedade" => "valor"). Ou false em caso de erro. 207 215 * @access public 208 * @deprecated 1.7.00.000216 * @deprecated 2.2.00.000 209 217 */ 210 218 function getInstanceProperties($instanceID) 211 219 { 220 wf_warn_deprecated_method('wf_instance', 'getProperties'); 212 221 $WFInstance = &Factory::getInstance('wf_instance'); 213 222 return $WFInstance->getProperties($instanceID); … … 219 228 * @return array Propriedades da instância filha. Array no formato "nome_da_propriedade" => "valor". 220 229 * @access public 221 * @deprecated 1.7.00.000230 * @deprecated 2.2.00.000 222 231 */ 223 232 function getChildInstanceProperties($instanceID) 224 233 { 234 wf_warn_deprecated_method('wf_instance', 'getProperties'); 225 235 $WFInstance = &Factory::getInstance('wf_instance'); 226 236 return $WFInstance->getProperties($instanceID); … … 333 343 * @return array As instâncias que satisfazem o critério de seleção. 334 344 * @access public 335 * @deprecated 1.7.00.000345 * @deprecated 2.2.00.000 336 346 */ 337 347 function getUserInstances($users, $activities = null, $status = null) 338 348 { 349 wf_warn_deprecated_method('wf_instance', 'getByUser'); 339 350 $WFInstance = &Factory::getInstance('wf_instance'); 340 351 return $WFInstance->getByUser($users, $activities, $status); … … 346 357 * @return bool true caso a propriedade tenha sido alterada com sucesso 347 358 * @access public 348 * @deprecated 1.7.00.000359 * @deprecated 2.2.00.000 349 360 */ 350 361 function setInstanceProperty($instanceID, $nameProperty, $value) 351 362 { 363 wf_warn_deprecated_method('wf_instance', 'setProperty'); 352 364 $WFInstance = &Factory::getInstance('wf_instance'); 353 365 return $WFInstance->setProperty($instanceID, $nameProperty, $value); … … 362 374 * @return bool true se o usuário tiver acesso à instância (levando em consideração $writeAccess) ou false caso contrário 363 375 * @access public 364 * @deprecated 1.7.00.000376 * @deprecated 2.2.00.000 365 377 */ 366 378 function checkUserAccessToInstance($userID, $instanceID, $activityID, $writeAccess = true) 367 379 { 380 wf_warn_deprecated_method('wf_instance', 'checkUserAccess'); 368 381 $WFInstance = &Factory::getInstance('wf_instance'); 369 382 return $WFInstance->checkUserAccess($userID, $instanceID, $activityID, $writeAccess); -
sandbox/workflow/trunk/inc/local/classes/class.wf_orgchart.php
r2466 r3060 480 480 return $output; 481 481 } 482 483 /** 484 * Return all areas that the employee is a supervisor. 485 * 486 * Search in the organization for all areas that the employee is a supervisor. 487 * @param int $employeeID The ID of employee 488 * @return array Array containing all the areas that the employeee is a supervisor. 489 * @access public 490 */ 491 function getSupervisorAreas($employeeID) { 492 493 if (!$employeeID) { 494 return false; 495 } 496 497 $query = "SELECT 498 a.area_id 499 FROM 500 area a 501 LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) 502 AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) 503 WHERE 504 a.titular_funcionario_id = ? OR 505 s.funcionario_id = ? 506 GROUP BY 507 a.area_id"; 508 509 $result = $this->db->query($query, array($employeeID,$employeeID)); 510 if (!$result) 511 return false; 512 513 $output = $result->GetArray(-1); 514 return $output; 515 } 482 516 483 517 /** -
sandbox/workflow/trunk/inc/local/functions/function.wf_create_object.php
r795 r3060 5 5 * @return mixed 6 6 * @license http://www.gnu.org/copyleft/gpl.html GPL 7 * @deprecated 1.4.00.000 - 08/03/20077 * @deprecated 2.2.00.000 8 8 * @package Workflow 9 9 * @subpackage local … … 12 12 function wf_create_object($class_name) 13 13 { 14 wf_warn_deprecated_method('Factory', 'getInstance'); 14 15 $obj = null; 15 16 $file_name = PHPGW_SERVER_ROOT.SEP.'workflow'.SEP.'inc'.SEP.'local'.SEP.'classes'.SEP.'class.'.$class_name.'.php'; -
sandbox/workflow/trunk/inc/log/Log.php
r795 r3060 167 167 /* If the class exists, return a new instance of it. */ 168 168 if (Log::_classExists($class)) { 169 $obj = &new $class($name, $ident, $conf, $level);169 $obj = new $class($name, $ident, $conf, $level); 170 170 return $obj; 171 171 } -
sandbox/workflow/trunk/inc/log/Log/observer.php
r795 r3060 79 79 */ 80 80 if (class_exists($class)) { 81 $object = &new $class($priority, $conf);81 $object = new $class($priority, $conf); 82 82 return $object; 83 83 } … … 103 103 /* Support both new-style and old-style construction. */ 104 104 if ($newstyle) { 105 $object = &new $class($priority, $conf);105 $object = new $class($priority, $conf); 106 106 } else { 107 $object = &new $class($priority);107 $object = new $class($priority); 108 108 } 109 109 return $object; -
sandbox/workflow/trunk/inc/smarty/plugins/function.html_options.php
r795 r3060 96 96 } 97 97 98 function smarty_function_html_boxoptions($params, &$smarty) 99 { 100 require_once $smarty->_get_plugin_filepath('shared','escape_special_chars'); 101 102 $name = null; 103 $values = null; 104 $options = null; 105 $selected = array(); 106 $output = null; 107 108 $extra = ''; 109 110 foreach($params as $_key => $_val) { 111 switch($_key) { 112 case 'name': 113 $$_key = (string)$_val; 114 break; 115 116 case 'options': 117 $$_key = (array)$_val; 118 break; 119 120 case 'values': 121 case 'output': 122 $$_key = array_values((array)$_val); 123 break; 124 125 case 'selected': 126 $$_key = array_map('strval', array_values((array)$_val)); 127 break; 128 129 default: 130 if(!is_array($_val)) { 131 $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; 132 } else { 133 $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE); 134 } 135 break; 136 } 137 } 138 139 if (!isset($options) && !isset($values)) 140 return ''; /* raise error here? */ 141 142 $_html_result = ''; 143 144 if (isset($options)) { 145 146 foreach ($options as $_key=>$_val) 147 $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected); 148 149 } else { 150 151 foreach ($values as $_i=>$_key) { 152 $_val = isset($output[$_i]) ? $output[$_i] : ''; 153 $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected); 154 } 155 156 } 157 158 if(!empty($name)) { 159 $_html_result = '<select name="' . $name . '"' . $extra . ' style="height: 100px;" size="5">' . "\n" . $_html_result . '</select>' . "\n"; 160 } 161 162 return $_html_result; 163 164 } 98 165 function smarty_function_html_options_optoutput($key, $value, $selected) { 99 166 if(!is_array($value)) { -
sandbox/workflow/trunk/inc/smarty/wf_plugins/function.wf_select_ldap_users.php
r2372 r3060 23 23 */ 24 24 function smarty_function_wf_select_ldap_users($params, &$smarty) 25 { 25 { 26 26 require_once $smarty->_get_plugin_filepath('function','html_options'); 27 27 $imagesPath = substr(Factory::getInstance('TemplateServer')->generateImageLink(''), 0, -1); … … 34 34 'size_input' => '20', 35 35 'opt_id' => 'dn', 36 'opt_name' => 'cn'); 36 'opt_name' => 'cn', 37 'opt_complement' => ''); 37 38 $extractParams = array( 38 39 'name', … … 42 43 'class_btn', 43 44 'opt_id', 44 'opt_name'); 45 'opt_name', 46 'opt_complement'); 45 47 46 48 /* verifica se todos os parâmetros obrigatórios foram passados */ … … 78 80 $output = <<<EOF 79 81 <input type="text" id="$name_input" name="$name_input" size="$size_input" /> 80 <input type="button" class="$class_btn" value="$value_btn" onclick="search_ldap_users_by_cn(document.getElementById('$name_input').value, '$name', '$opt_id', '$opt_name', $handleExpiredSessions )" />82 <input type="button" class="$class_btn" value="$value_btn" onclick="search_ldap_users_by_cn(document.getElementById('$name_input').value, '$name', '$opt_id', '$opt_name', $handleExpiredSessions, '$opt_complement')" /> 81 83 <img id="$name_img" border="0" src="$imagesPath/loading.gif" style="display:none"> 82 <span id="$name_span" style="display:none"> <b>Selecione o nome: </b>84 <span id="$name_span" style="display:none"><br><br><b>Selecione um nome abaixo: </b><br><br> 83 85 EOF; 84 86 85 $output .= smarty_function_html_ options(array_merge(array(87 $output .= smarty_function_html_boxoptions(array_merge(array( 86 88 'name' => $name, 87 89 'id' => $name, -
sandbox/workflow/trunk/inc/smarty/wf_plugins/function.wf_select_user.php
r2372 r3060 12 12 * - email_as_textarea : indica se o campo que receberá os emails deve ser um textarea (valor true) ou input type text (valor false). Este parâmetro só tem validade se get_email for true. 13 13 * - hide_groups : indica se deve-se omitir os grupos na tela de seleção. 14 * - onlyVisibleAccounts : indica se devem ser recuperadas apenas as contas visíveis, ou se as ocultas também devem ser listadas. 14 15 * - organization : nome da organização que estará previamente selecionada. 15 16 * - title : texto da tooltip que aparecerá quando o usuário colocar o mouse sobre o ícone para adicionar usuário. … … 35 36 'hide_organizations' => false, 36 37 'hide_sectors' => false, 38 'onlyVisibleAccounts' => true, 37 39 'rows'=> 2); 38 40 $extractParams = array( … … 42 44 'title', 43 45 'cols', 44 'rows'); 46 'rows', 47 'onlyVisibleAccounts'); 45 48 46 49 /* verifica se todos os parâmetros obrigatórios foram passados */ … … 93 96 if ($params['hide_sectors'] == true) 94 97 $extraParams .= "&hideSectors=1"; 98 if (empty($onlyVisibleAccounts) || $onlyVisibleAccounts === 'false') 99 $extraParams .= "&onlyVisibleAccounts=false"; 100 else 101 $extraParams .= "&onlyVisibleAccounts=true"; 95 102 96 103 $image = Factory::getInstance('TemplateServer')->generateImageLink('add_user.png'); 97 104 98 $output .= <<<EOF99 <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipants('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a>105 $output .= <<<EOF 106 <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipants('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a> 100 107 EOF; 101 108 return $output; -
sandbox/workflow/trunk/inc/smarty/wf_plugins/function.wf_select_users.php
r2372 r3060 8 8 * - value : usuários e grupos previamente selecionados. Deve estar no formato de matriz, seguindo o seguinte padrão: ::$matriz["u123"]="Nome do usuário 123" ; $matriz["g321"]="Nome do grupo 321" e, assim por diante. 9 9 * - hide_groups : indica se deve-se omitir os grupos na tela de seleção. 10 * - onlyVisibleAccounts : indica se devem ser recuperadas apenas as contas visíveis, ou se as ocultas também devem ser listadas. 10 11 * - organization : nome da organização que estará previamente selecionada. 11 12 * @param object &$smarty Instância do objeto smarty em uso … … 24 25 'hide_organizations' => false, 25 26 'hide_sectors' => false, 27 'onlyVisibleAccounts' => true, 26 28 'value' => array()); 27 29 $extractParams = array( 28 30 'name', 29 'value'); 31 'value', 32 'onlyVisibleAccounts'); 30 33 31 34 /* verifica se todos os parâmetros obrigatórios foram passados */ … … 54 57 if ($params['hide_sectors'] == true) 55 58 $extraParams .= "&hideSectors=1"; 59 if (empty($onlyVisibleAccounts) || $onlyVisibleAccounts === 'false') 60 $extraParams .= "&onlyVisibleAccounts=false"; 61 else 62 $extraParams .= "&onlyVisibleAccounts=true"; 56 63 57 64 $output = '<table border="0"><tr><td>'; … … 66 73 $output .= "</td><td>"; 67 74 $output .= <<<EOF 68 <a href='javascript:void(0)' onclick="openParticipants(500, 270, '$name', '$extraParams');"><img border="0" src="$imagesPath/add_group.png"></a>75 <a href='javascript:void(0)' onclick="openParticipants(500, 315, '$name', '$extraParams');"><img border="0" src="$imagesPath/add_group.png"></a> 69 76 <br /> 70 <a href='javascript:void(0)' onclick="openParticipants(500, 270, '$name', '$extraParams');">Adicionar</a>77 <a href='javascript:void(0)' onclick="openParticipants(500, 315, '$name', '$extraParams');">Adicionar</a> 71 78 <br /><br /> 72 79 <a href='javascript:void(0)' onclick="delUsers('$name');"><img border="0" src="$imagesPath/delete_group.png"></a>
Note: See TracChangeset
for help on using the changeset viewer.