Changeset 547 for trunk/phpgwapi
- Timestamp:
- 11/03/08 16:05:23 (15 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.accounts_contacts.inc.php
r2 r547 115 115 $this->data['status'] = $allValues[0]['account_status']; 116 116 $this->data['expires'] = $allValues[0]['account_expires']; 117 117 $this->data['agree_terms'] = $allValues[0]['phpgwagreeterm'][0]; 118 118 return $this->data; 119 119 } -
trunk/phpgwapi/inc/class.accounts_ldap.inc.php
r513 r547 63 63 { 64 64 /* jakjr: using justthese with ldap_search */ 65 $justthese = array("uidnumber", "gidnumber", "uid", "cn", "givenname", "sn", "mail", "phpgwaccountstatus", "phpgwaccountexpires", "phpgwaccounttype", "phpgwlastpasswdchange" );65 $justthese = array("uidnumber", "gidnumber", "uid", "cn", "givenname", "sn", "mail", "phpgwaccountstatus", "phpgwaccountexpires", "phpgwaccounttype", "phpgwlastpasswdchange","phpgwagreeterm"); 66 66 $sri = @ldap_search($this->ds, $this->user_context, ("(&(uidnumber=" . (int)$this->account_id.")(phpgwaccounttype=u))"), $justthese); 67 67 } … … 99 99 $this->data['expires'] = $allValues[0]['phpgwaccountexpires'][0]; 100 100 $this->data['type'] = $allValues[0]['phpgwaccounttype'][0]; 101 $this->data['agree_terms'] = $allValues[0]['phpgwagreeterm'][0]; 101 102 } 102 103 $this->data['account_dn'] = $allValues[0]['dn']; -
trunk/phpgwapi/templates/celepar/navbar.inc.php
r79 r547 235 235 $var['frontend_name'] = " - ".$GLOBALS['phpgw_info']['server']['use_frontend_name']; 236 236 237 if($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == '0') 237 /* 238 * Forçar termo de aceite por parte do usuário 239 */ 240 241 if(($GLOBALS['phpgw_info']['user']['agree_terms'] != 1) && ($GLOBALS['phpgw_info']['server']['use_agree_term']=='True')) //Ele deverá confirmar o termo de aceite. 242 { 243 $agreeterm_url = $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/termo_aceite.php'; 244 245 if ($GLOBALS['phpgw_info']['server']['use_https'] > 0) 246 $agreeterm_url = 'https://' . $agreeterm_url; 247 else 248 $agreeterm_url = 'http://' . $agreeterm_url; 249 250 echo '<script>' . 251 'if(location.href.indexOf("termo_aceite.php") == -1){' . 252 'location.href = "' . $agreeterm_url . '"' . 253 '}' . 254 '</script>'; 255 } 256 257 258 if(($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == '0') && (($GLOBALS['phpgw_info']['user']['agree_terms'] == 1) || ($GLOBALS['phpgw_info']['server']['use_agree_term']!='True'))) 238 259 { 239 260 $changepasswd_url = $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/changepassword.php?cd=1';
Note: See TracChangeset
for help on using the changeset viewer.