Changeset 86
- Timestamp:
- 10/19/07 10:23:42 (17 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
admin/inc/class.uiasyncservice.inc.php (modified) (1 diff)
-
calendar/inc/class.socalendar_sql.inc.php (modified) (1 diff)
-
expressoAdmin1_2/inc/class.group.inc.php (modified) (2 diffs)
-
expressoAdmin1_2/inc/class.maillist.inc.php (modified) (4 diffs)
-
expressoAdmin1_2/js/jscode/groups.js (modified) (3 diffs)
-
expressoAdmin1_2/js/jscode/maillists.js (modified) (3 diffs)
-
instant_messenger/inc/class.contacts_im.inc.php (modified) (2 diffs)
-
instant_messenger/templates/default/config.tpl (modified) (1 diff)
-
instant_messenger/templates/default/script_load.php (modified) (3 diffs)
-
instant_messenger/templates/default/start_script.php (modified) (1 diff)
-
instant_messenger/templates/default/stop_script.php (modified) (1 diff)
-
phpgwapi/cron/asyncservices.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/inc/class.uiasyncservice.inc.php
r2 r86 194 194 foreach($jobs as $job) 195 195 { 196 echo "<tr>\n<td>$job[id]</td><td>".$GLOBALS['phpgw']->common->show_date($job['next'])."</td><td>"; 197 print_r($job['times']); 196 //echo "<tr>\n<td>$job[id]</td><td>".$GLOBALS['phpgw']->common->show_date($job['next'])."</td><td>"; 197 echo "<tr>\n<td>$job[id]</td><td>".date("d/m/Y H:i", $job['next'])."</td><td>"; 198 //print_r($GLOBALS['phpgw']->common->show_date($job['times'])); 199 print_r(date("d/m/Y H:i", $job['times'])); 198 200 echo "</td><td>$job[method]</td><td>"; 199 201 print_r($job['data']); -
trunk/calendar/inc/class.socalendar_sql.inc.php
r2 r86 176 176 $alarm['cal_id'] = $cal_id; // we need the back-reference 177 177 178 $alarm['time'] -= $GLOBALS['phpgw']->datetime->tz_offset; // time should be stored in server timezone178 //$alarm['time'] -= $GLOBALS['phpgw']->datetime->tz_offset; // time should be stored in server timezone 179 179 if (!$this->async->set_timer($alarm['time'],$id,'calendar.bocalendar.send_alarm',$alarm)) 180 180 { -
trunk/expressoAdmin1_2/inc/class.group.inc.php
r64 r86 332 332 foreach($add_users as $uidnumber) 333 333 { 334 if (is_numeric($uidnumber) )334 if (is_numeric($uidnumber) && ($uidnumber != -1)) 335 335 { 336 336 $this->db_functions->add_user2group($new_values['gidnumber'], $uidnumber); … … 352 352 foreach($remove_users as $uidnumber) 353 353 { 354 $this->db_functions->remove_user2group($new_values['gidnumber'], $uidnumber); 355 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 356 $array_memberUids_remove[] = $user; 357 $this->db_functions->write_log("Removido usuário $user do grupo $dn.",$dn,'','',''); 354 if ($uidnumber != -1) 355 { 356 $this->db_functions->remove_user2group($new_values['gidnumber'], $uidnumber); 357 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 358 $array_memberUids_remove[] = $user; 359 $this->db_functions->write_log("Removido usuário $user do grupo $dn.",$dn,'','',''); 360 } 358 361 } 359 362 $this->ldap_functions->remove_user2group($new_values['gidnumber'], $array_memberUids_remove); -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r64 r86 247 247 foreach($add_users as $uidnumber) 248 248 { 249 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 250 $array_emails_add[] = $mail; 251 $this->db_functions->write_log("Adicionado usuario $mail a lista",$dn,$uidnumber,'',''); 249 if ($uidnumber != -1) 250 { 251 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 252 $array_emails_add[] = $mail; 253 $this->db_functions->write_log("Adicionado usuario $mail a lista",$dn,$uidnumber,'',''); 254 } 252 255 } 253 256 $this->ldap_functions->add_user2maillist($new_values['uidnumber'], $array_emails_add); … … 258 261 foreach($remove_users as $uidnumber) 259 262 { 260 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 263 if ($uidnumber != -1) 264 { 265 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 261 266 262 // Não achei o email do usuário no ldap.263 if (empty($mail))264 $mail = $uidnumber;267 // Não achei o email do usuário no ldap. 268 if (empty($mail)) 269 $mail = $uidnumber; 265 270 266 $array_emails_remove[] = $mail; 267 $this->db_functions->write_log("Removido usuario $mail da lista",$dn,$uidnumber,'',''); 271 $array_emails_remove[] = $mail; 272 $this->db_functions->write_log("Removido usuario $mail da lista",$dn,$uidnumber,'',''); 273 } 268 274 } 269 275 $this->ldap_functions->remove_user2maillist($new_values['uidnumber'], $array_emails_remove); … … 360 366 foreach($add_users as $uidnumber) 361 367 { 362 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 363 $array_emails_add[] = $mail; 364 $this->db_functions->write_log("Adicionado usuario $mail a SCL da lista $dn",'',$uidnumber,'',''); 368 if ($uidnumber != -1) 369 { 370 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 371 $array_emails_add[] = $mail; 372 $this->db_functions->write_log("Adicionado usuario $mail a SCL da lista $dn",'',$uidnumber,'',''); 373 } 365 374 } 366 375 $result = $this->ldap_functions->add_user2maillist_scl($dn, $array_emails_add); … … 378 387 foreach($remove_users as $uidnumber) 379 388 { 380 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 381 $array_emails_remove[] = $mail; 382 $this->db_functions->write_log("Removido usuario $mail da SCP da lista $dn",'',$uidnumber,'',''); 389 if ($uidnumber != -1) 390 { 391 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 392 $array_emails_remove[] = $mail; 393 $this->db_functions->write_log("Removido usuario $mail da SCP da lista $dn",'',$uidnumber,'',''); 394 } 383 395 } 384 396 $result = $this->ldap_functions->remove_user2maillist_scl($dn, $array_emails_remove); -
trunk/expressoAdmin1_2/js/jscode/groups.js
r81 r86 144 144 { 145 145 // Necessario, pois o IE6 tem um bug que retira o primeiro options se o innerHTML estiver vazio. 146 select_available_users.innerHTML = ' lixo' + data;146 select_available_users.innerHTML = ' ' + data; 147 147 select_available_users.outerHTML = select_available_users.outerHTML; 148 148 … … 161 161 // Limpa select 162 162 select_available_users = document.getElementById('ea_select_available_users'); 163 select_available_users.innerHTML = ' lixo';163 select_available_users.innerHTML = ' '; 164 164 select_available_users.outerHTML = select_available_users.outerHTML; 165 165 return; … … 208 208 if (new_options != '') 209 209 { 210 select_usersInGroup.innerHTML = ' lixo' + new_options + select_usersInGroup.innerHTML;210 select_usersInGroup.innerHTML = ' ' + new_options + select_usersInGroup.innerHTML; 211 211 select_usersInGroup.outerHTML = select_usersInGroup.outerHTML; 212 212 document.getElementById('ea_input_searchUser').value = ""; -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r81 r86 167 167 { 168 168 // Necessario, pois o IE6 tem um bug que retira o primeiro options se o innerHTML estiver vazio. 169 select_available_users.innerHTML = ' lixo' + data;169 select_available_users.innerHTML = ' ' + data; 170 170 select_available_users.outerHTML = select_available_users.outerHTML; 171 171 … … 184 184 // Limpa select 185 185 select_available_users = document.getElementById('ea_select_available_users'); 186 select_available_users.innerHTML = ' lixo';186 select_available_users.innerHTML = ' '; 187 187 select_available_users.outerHTML = select_available_users.outerHTML; 188 188 return; … … 231 231 if (new_options != '') 232 232 { 233 select_usersInMaillist.innerHTML = ' lixo' + new_options + select_usersInMaillist.innerHTML;233 select_usersInMaillist.innerHTML = ' ' + new_options + select_usersInMaillist.innerHTML; 234 234 select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML; 235 235 document.getElementById('ea_input_searchUser').value = ""; -
trunk/instant_messenger/inc/class.contacts_im.inc.php
r77 r86 32 32 // Busca Grupos 33 33 $groups = $this->ldap->list_groups_ldap($search_groups); 34 34 35 35 $search_uids = "|"; 36 36 if($groups) … … 50 50 } 51 51 $uids_members = $this->ldap->list_users_ldap($search_uids); 52 52 53 53 if(count($uids_members) > 0) 54 54 return $uids_members; -
trunk/instant_messenger/templates/default/config.tpl
r68 r86 57 57 <tr bgcolor="{row_on}"> 58 58 <td colspan="2"> 59 <iframe src ="instant_messenger/templates/default/script_load.php " frameborder="0" height="60px" scrolling="no"></iframe>59 <iframe src ="instant_messenger/templates/default/script_load.php?user={value_user_ldap_jabber}" frameborder="0" height="60px" scrolling="no"></iframe> 60 60 </td> 61 61 </tr> -
trunk/instant_messenger/templates/default/script_load.php
r68 r86 9 9 if(!validate_form() || number_process != "") 10 10 document.im_script_load.start_script.disabled = true; 11 11 12 } 12 13 function info_process_id() … … 44 45 <?php 45 46 46 if( $_POST['start_script'])47 if( isset($_SESSION['phpgw_info']['instant_messenger']['user']) ) 47 48 { 48 exec("php -q start_script.php"); 49 unset($_POST['start_script']); 50 } 51 52 if($_POST['stop_script']) 53 { 54 exec("php -q stop_script.php"); 55 unset($_POST['stop_script']); 56 } 57 58 $process = shell_exec("ps aux | grep IMManager.php$ | cut -c10-14"); 59 $process = preg_replace("/\\n/","",$process); 60 echo "<script>number_process='".$process."'</script>"; 49 if($_REQUEST['user'] || $_SESSION['phpgw_info']['instant_messenger']['user'] == "rodsouza" || $_SESSION['phpgw_info']['instant_messenger']['user'] == "alexandrecorreia") 50 { 51 if($_POST['start_script']) 52 { 53 exec("php -q start_script.php user"); 54 unset($_POST['start_script']); 55 } 56 57 if($_POST['stop_script']) 58 { 59 exec("php -q stop_script.php user"); 60 unset($_POST['stop_script']); 61 } 62 63 $process = shell_exec("ps aux | grep IMManager.php$ | cut -c10-14"); 64 $process = preg_replace("/\\n/","",$process); 65 echo "<script>number_process='".$process."'</script>"; 66 67 }else 68 exit; 69 }else 70 exit; 71 61 72 ?> 62 73 <style> … … 91 102 <input type="submit" value="Start Script" name="start_script" /> 92 103 <input type="submit" value="Stop Script" name="stop_script" /> 104 <input type="hidden" name="user" value="user" /> 93 105 </form> 94 106 </body> -
trunk/instant_messenger/templates/default/start_script.php
r68 r86 1 1 #!/usr/bin/php5 -q 2 2 <?php 3 4 exec("php -q /var/www/expresso/instant_messenger/IMManager.php &>/dev/null &"); 5 set_time_limit(1); 3 4 if(trim($argv[1]) == "user") 5 { 6 exec("php -q /var/www/expresso/instant_messenger/IMManager.php &>/dev/null &"); 7 set_time_limit(1); 8 } 6 9 ?> -
trunk/instant_messenger/templates/default/stop_script.php
r68 r86 2 2 <?php 3 3 4 exec("killall php >/dev/null &"); 5 set_time_limit(1); 4 if(trim($argv[1]) == "user") 5 { 6 exec("killall php >/dev/null &"); 7 set_time_limit(1); 8 } 6 9 ?> -
trunk/phpgwapi/cron/asyncservices.php
r2 r86 90 90 91 91 include(PHPGW_API_INC.'/functions.inc.php'); 92 $preferences = createobject('phpgwapi.preferences'); 93 $preferences->read(); 92 94 93 95 $num = ExecMethod('phpgwapi.asyncservice.check_run','crontab');
Note: See TracChangeset
for help on using the changeset viewer.
