Merge branch 'master' into migration-bootstrap-2-to-3

SE/procesy/zasob.php

@@ -24,7 +24,7 @@ function task_CRM_LISTA_ZASOBOW() {
 
 	$tbl_conf = Column::getInstance($tbl);
 	if (!$tbl_conf) {
-		echo'<p class="red">'."Brak konfiguracji dla ".$tbl."!".'</p>';
+		echo'<p class="red">'."Brak konfiguracji dla {$tbl}!".'</p>';
 		return;
 	}
 	$dbgExecTime->log('Column::getInstance');

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -284,13 +284,13 @@ define(\"DEBUG_GENERATE\", 3); # [1=ERROR|2=WARN|3=INFO|4=DEBUG|5=TRACE]
 define(\"DB_NO_WRITES\",   0); # [0|1] Experimental, use with CAUTION!
 define(\'REDIRECTING_DELAY\', \"1\");
 define(\'ALLOW_DEPLOYMENT\', 1);
-\\\\\$STATIC_CONFIG = array(\"static_cfg\");
+\\$STATIC_CONFIG = array(\"static_cfg\");
 define(\'CHECK_STATIC_SYNTAX\', 1);
-\\\\\$SUPERADMIN_GROUPS = array (\"+admins\");
-\\\\\$ONCALL_GROUPS = array ();
+\\$SUPERADMIN_GROUPS = array (\"+admins\");
+\\$ONCALL_GROUPS = array ();
 define(\'CHECK_STATIC_SYNTAX\', 1);
-\\\\\$SUPERADMIN_GROUPS = array (\"+admins\");
-\\\\\$ONCALL_GROUPS = array ();
+\\$SUPERADMIN_GROUPS = array (\"+admins\");
+\\$ONCALL_GROUPS = array ();
 define(\'OVERVIEW_QUANTITY_STANDARD\', \"25\");
 define(\'SELECT_VALUE_SEPARATOR\', \"::\");
 define(\'PASSWD_ENC\', \"clear\");
@@ -317,11 +317,11 @@ alter ignore table nconf.ConfigItems add DEVICES_ID int(11) ; " | mysql -D nconf
 -- zapytanie do importu z SE zasobow oraz urzadzen do monitoringu do nconfa do icinga
 
 -- w razie co mozna usunac dodane rekordy w taki sposob
- delete  FROM nconf.\\\\\`ConfigValues\\\\\` WHERE \\\\\`A_RECORD_CREATE_AUTHOR\\\\\` like \'SE_IMPORT\';
- delete  FROM nconf.\\\\\`ItemLinks\\\\\`  WHERE \\\\\`A_RECORD_CREATE_AUTHOR\\\\\` like \'SE_IMPORT\';
- delete  FROM nconf.\\\\\`ConfigItems\\\\\` WHERE \\\\\`A_RECORD_CREATE_AUTHOR\\\\\` like \'SE_IMPORT\';
- delete  FROM nconf.\\\\\`ConfigAttrs\\\\\` WHERE \\\\\`A_RECORD_CREATE_AUTHOR\\\\\` like \'SE_IMPORT\';
- delete  FROM nconf.\\\\\`ConfigClasses\\\\\` WHERE \\\\\`A_RECORD_CREATE_AUTHOR\\\\\` like \'SE_IMPORT\';
+ delete  FROM nconf.\\`ConfigValues\\` WHERE \\`A_RECORD_CREATE_AUTHOR\\` like \'SE_IMPORT\';
+ delete  FROM nconf.\\`ItemLinks\\`  WHERE \\`A_RECORD_CREATE_AUTHOR\\` like \'SE_IMPORT\';
+ delete  FROM nconf.\\`ConfigItems\\` WHERE \\`A_RECORD_CREATE_AUTHOR\\` like \'SE_IMPORT\';
+ delete  FROM nconf.\\`ConfigAttrs\\` WHERE \\`A_RECORD_CREATE_AUTHOR\\` like \'SE_IMPORT\';
+ delete  FROM nconf.\\`ConfigClasses\\` WHERE \\`A_RECORD_CREATE_AUTHOR\\` like \'SE_IMPORT\';
 
 -- bierzemy z zasobow dane tylko takie, ktore nie maja powiazanych DEVICES (bierzemy tylko devices)
 insert into nconf.ConfigItems ( id_item , fk_id_class , DEVICES_ID,A_RECORD_CREATE_AUTHOR) 
@@ -333,10 +333,10 @@ insert into nconf.ConfigItems ( id_item , fk_id_class , DEVICES_ID,A_RECORD_CREA
 insert ignore into nconf.ConfigValues ( attr_value, fk_id_attr, fk_id_item, A_RECORD_CREATE_AUTHOR ) 
   select 
   if( ConfigAttrs.Attr_name like \'%host_name%\'
-   , left(replace(replace(replace(replace(replace(replace(concat(DEV.ID,\'-\',DEV.T_DEVICE_SERIAL,\'-\',DEV.S_HW,\'[\',\\\\\`CLZ\\\\\`.ID,\'] URZADZENIE \', DEV.T_DEVICE_TYPE,\'-\',CLZ.\\\\\`DESC\\\\\`,\' \'),\',\',\'\'),\'/\',\'\'),\'(\',\'\'),\')\',\'\'),\'%\',\'\'),\'?\',\'\'),50)
+   , left(replace(replace(replace(replace(replace(replace(concat(DEV.ID,\'-\',DEV.T_DEVICE_SERIAL,\'-\',DEV.S_HW,\'[\',\\`CLZ\\`.ID,\'] URZADZENIE \', DEV.T_DEVICE_TYPE,\'-\',CLZ.\\`DESC\\`,\' \'),\',\',\'\'),\'/\',\'\'),\'(\',\'\'),\')\',\'\'),\'%\',\'\'),\'?\',\'\'),50)
    , 
- if( ConfigAttrs.Attr_name like \'alias\', \\\\\`DEV\\\\\`.\\\\\`S_IP\\\\\`,
- if( ConfigAttrs.Attr_name like \'address\', \\\\\`DEV\\\\\`.\\\\\`S_IP\\\\\`,
+ if( ConfigAttrs.Attr_name like \'alias\', \\`DEV\\`.\\`S_IP\\`,
+ if( ConfigAttrs.Attr_name like \'address\', \\`DEV\\`.\\`S_IP\\`,
  if( ConfigAttrs.Attr_name like \'host_is_collector\',\'no\',\'\')
 )
 )
@@ -417,17 +417,17 @@ group by ConfigItems.id_item;
 insert into nconf.ConfigItems ( id_item , fk_id_class , CRM_LISTA_ZASOBOW_ID , A_RECORD_CREATE_AUTHOR) 
  select  \'\', 1, CRM_LISTA_ZASOBOW.ID ,\'SE_IMPORT\' from '.$REMOTE_FOLDER_ROOT.'.CRM_LISTA_ZASOBOW 
    left join nconf.ConfigItems as ConfigItems_2 on ConfigItems_2.CRM_LISTA_ZASOBOW_ID=CRM_LISTA_ZASOBOW.ID
-   where CRM_LISTA_ZASOBOW.\\\\\`TYPE\\\\\`=\'SERWER\' and ConfigItems_2.CRM_LISTA_ZASOBOW_ID is null ;
+   where CRM_LISTA_ZASOBOW.\\`TYPE\\`=\'SERWER\' and ConfigItems_2.CRM_LISTA_ZASOBOW_ID is null ;
 
 -- dodajemy zasoby do monitoringu w inteligentny sposob razem z waznymi parametrami - jak to widac w zapytaniu
 insert ignore into nconf.ConfigValues ( attr_value, fk_id_attr, fk_id_item , A_RECORD_CREATE_AUTHOR
  ) 
   select 
   if( ConfigAttrs.Attr_name like \'%host_name%\'
-   , left(replace(replace(replace(replace(replace(replace(concat(\'[\',\\\\\`CLZ\\\\\`.ID,\'] SERWER \',CLZ.\\\\\`DESC\\\\\`,\' \',CLZ.\\\\\`OPIS\\\\\`),\',\',\'\'),\'/\',\'\'),\'(\',\'\'),\')\',\'\'),\'%\',\'\'),\'?\',\'\'),40)
+   , left(replace(replace(replace(replace(replace(replace(concat(\'[\',\\`CLZ\\`.ID,\'] SERWER \',CLZ.\\`DESC\\`,\' \',CLZ.\\`OPIS\\`),\',\',\'\'),\'/\',\'\'),\'(\',\'\'),\')\',\'\'),\'%\',\'\'),\'?\',\'\'),40)
    , 
- if( ConfigAttrs.Attr_name like \'alias\', \\\\\`CLZ\\\\\`.\\\\\`DESC\\\\\`,
- if( ConfigAttrs.Attr_name like \'address\', \\\\\`CLZ\\\\\`.\\\\\`DESC\\\\\`,
+ if( ConfigAttrs.Attr_name like \'alias\', \\`CLZ\\`.\\`DESC\\`,
+ if( ConfigAttrs.Attr_name like \'address\', \\`CLZ\\`.\\`DESC\\`,
  if( ConfigAttrs.Attr_name like \'host_is_collector\',\'no\',\'\')
 )
 )
@@ -439,7 +439,7 @@ insert ignore into nconf.ConfigValues ( attr_value, fk_id_attr, fk_id_item , A_R
  in (\'host_name\',\'alias\',\'address\',\'notes\',\'notes_url\',\'host_is_collector\',\'action_url\',\'max_check_attempts\',\'check_interval\',\'retry_interval\',\'first_notification_delay\',\'notification_interval\',\'notification_options\',\'active_checks_enabled\',\'passive_checks_enabled\',\'notifications_enabled\',\'check_freshness\',\'freshness_threshold\')   and  ConfigAttrs.fk_id_class=\'1\'
    left join nconf.ConfigItems as ConfigItems on ConfigItems.CRM_LISTA_ZASOBOW_ID=CLZ.ID
    left join '.$REMOTE_FOLDER_ROOT.'.DEVICES as DEVICES on DEVICES.CRM_LISTA_ZASOBOW_ID=CLZ.ID
- where CLZ.\\\\\`TYPE\\\\\`=\'SERWER\' and DEVICES.CRM_LISTA_ZASOBOW_ID is NULL;
+ where CLZ.\\`TYPE\\`=\'SERWER\' and DEVICES.CRM_LISTA_ZASOBOW_ID is NULL;
 -- dodajemy potrzebne wpisy odnosnie klasy monitorowania
 insert ignore into nconf.ItemLinks ( fk_id_item,fk_item_linked2,fk_id_attr , A_RECORD_CREATE_AUTHOR
  ) 
@@ -562,7 +562,7 @@ $cmd[]['rsh']='cat /etc/sudoers |grep "_www ALL = NOPASSWD: /sbin/pfctl" || echo
  " >> /etc/sudoers;
  cat /etc/sudoers |grep "_www ALL = NOPASSWD: /sbin/pfctl"';
 
-// $cmd[]['rsh']='echo \\\\\$UID';
+// $cmd[]['rsh']='echo \\$UID';
 // $cmd[]['rsh']='echo "Uruchamiam zdalna procedure instalacji SE " |wall ';
  $cmd[]['rsh']='launchctl load -w /System/Library/LaunchDaemons/com.apple.locate.plist'; //wyszukowanie plikow
 
@@ -770,7 +770,7 @@ $cmd[]['rsh']='cat /opt/local/etc/mysql55/my.cnf | grep "lower_case_table_names
 return $cmd;
 }
 
-function INSTALL_GETCOMMANDS_WEBMAIL($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+function INSTALL_GETCOMMANDS_WEBMAIL($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 
 
  $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p'.$ADMIN_USERNAME_PASSWD.' drop webmail || echo PASSED ';
@@ -794,7 +794,7 @@ chown _www logs/ || exit 1
  //ustalenie domyslnych identities na webmailu po zalogowaniu wlasciwych dla domeny
  $cmd[]['rsh']='test -n "'.$SERVER_ADDRESS_SHORT.'" && sed -i.bak "s/@DOMAIN_TO_EDIT/@'.$SERVER_ADDRESS_SHORT.'/"  /Library/Server/Web/Data/Sites/Default/webmail/loginFromSE.php'; 
  $cmd[]['rsh']='test -n "'.$SERVER_ADDRESS.'" && sed -i.bak "s/@DOMAIN_TO_EDIT/@'.$SERVER_ADDRESS.'/"  /Library/Server/Web/Data/Sites/Default/webmail/loginFromSE.php'; 
- $cmd[]['rsh']='sed -i.bak "s/\/\/\\\\\$RCMAIL->db->query(/\\\\\$RCMAIL->db->query(/"  /Library/Server/Web/Data/Sites/Default/webmail/loginFromSE.php'; 
+ $cmd[]['rsh']='sed -i.bak "s/\/\/\\$RCMAIL->db->query(/\\$RCMAIL->db->query(/"  /Library/Server/Web/Data/Sites/Default/webmail/loginFromSE.php'; 
 // $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/OfflineIMAP-offlineimap-v6.5.5-0-g8bc2f35.tar',' /Library/Server/Web/Data/Sites/Default/');
 // $cmd[]['rsh']='tar -zxpvf /Library/Server/Web/Data/Sites/Default/OfflineIMAP-offlineimap-v6.5.5-0-g8bc2f35.tar* -C /Library/Server/Web/Data/Sites/Default/'; 
  $cmd[]['rsh']='chmod +a "_www allow writeattr,readextattr,writeextattr,readsecurity,writesecurity,chown,add_file,add_subdirectory,delete_child,list,search,file_inherit,directory_inherit" /Library/WebServer/';
@@ -819,129 +819,132 @@ chown _www logs/ || exit 1
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/webmail || exit 1
  
  echo "<?
-\\\\$rcmail_config = array();
-\\\\$rcmail_config[\'debug_level\'] = 1;
-\\\\$rcmail_config[\'log_driver\'] = \'file\';
-\\\\$rcmail_config[\'log_date_format\'] = \'d-M-Y H:i:s O\';
-\\\\$rcmail_config[\'syslog_id\'] = \'roundcube\';
-\\\\$rcmail_config[\'syslog_facility\'] = LOG_USER;
-\\\\$rcmail_config[\'smtp_log\'] = true;
-\\\\$rcmail_config[\'log_logins\'] = false;
-\\\\$rcmail_config[\'log_session\'] = false;
-\\\\$rcmail_config[\'sql_debug\'] = false;
-\\\\$rcmail_config[\'imap_debug\'] = false;
-\\\\$rcmail_config[\'ldap_debug\'] = false;
-\\\\$rcmail_config[\'smtp_debug\'] = false;
-\\\\$rcmail_config[\'default_host\'] = \'127.0.0.1\';
-\\\\$rcmail_config[\'default_port\'] = 143;
-\\\\$rcmail_config[\'imap_auth_type\'] = PLAIN;
-\\\\$rcmail_config[\'imap_delimiter\'] = null;
-\\\\$rcmail_config[\'imap_ns_personal\'] = null;
-\\\\$rcmail_config[\'imap_ns_shared\']   = null;
-\\\\$rcmail_config[\'imap_force_caps\'] = false;
-\\\\$rcmail_config[\'imap_force_lsub\'] = false;
-\\\\$rcmail_config[\'imap_force_ns\'] = false;
-\\\\$rcmail_config[\'imap_timeout\'] = 0;
-\\\\$rcmail_config[\'imap_auth_cid\'] = null;
-\\\\$rcmail_config[\'imap_auth_pw\'] = null;
-\\\\$rcmail_config[\'imap_cache\'] = null;
-\\\\$rcmail_config[\'messages_cache\'] = false;
-\\\\$rcmail_config[\'smtp_server\'] = \'127.0.0.1\';
-\\\\$rcmail_config[\'smtp_port\'] = 25;
-\\\\$rcmail_config[\'smtp_user\'] = \'\';
-\\\\$rcmail_config[\'smtp_pass\'] = \'\';
-\\\\$rcmail_config[\'smtp_auth_type\'] = \'\';
-\\\\$rcmail_config[\'smtp_auth_cid\'] = null;
-\\\\$rcmail_config[\'smtp_auth_pw\'] = null;
-\\\\$rcmail_config[\'smtp_helo_host\'] = \'\';
-\\\\$rcmail_config[\'smtp_timeout\'] = 0;
-\\\\$rcmail_config[\'enable_installer\'] = false;
-\\\\$rcmail_config[\'dont_override\'] = array();
-\\\\$rcmail_config[\'support_url\'] = \'\';
-\\\\$rcmail_config[\'skin_logo\'] = null;
-\\\\$rcmail_config[\'auto_create_user\'] = true;
-\\\\$rcmail_config[\'user_aliases\'] = false;
-\\\\$rcmail_config[\'log_dir\'] = \'logs/\';
-\\\\$rcmail_config[\'temp_dir\'] = \'temp/\';
-\\\\$rcmail_config[\'message_cache_lifetime\'] = \'10d\';
-\\\\$rcmail_config[\'force_https\'] = false;
-\\\\$rcmail_config[\'use_https\'] = false;
-\\\\$rcmail_config[\'login_autocomplete\'] = 0;
-\\\\$rcmail_config[\'login_lc\'] = 2;
-\\\\$rcmail_config[\'skin_include_php\'] = false;
-\\\\$rcmail_config[\'display_version\'] = false;
-\\\\$rcmail_config[\'session_lifetime\'] = 10;
-\\\\$rcmail_config[\'session_domain\'] = \'\';
-\\\\$rcmail_config[\'session_name\'] = null;
-\\\\$rcmail_config[\'session_path\'] = null;
-\\\\$rcmail_config[\'session_storage\'] = \'db\';
-\\\\$rcmail_config[\'ip_check\'] = false;
-\\\\$rcmail_config[\'referer_check\'] = false;
-\\\\$rcmail_config[\'x_frame_options\'] = \'sameorigin\';
-\\\\$rcmail_config[\'des_key\'] = \'+oEkJSMxbrsl%C!J1f3AjJK-\';
-\\\\$rcmail_config[\'username_domain\'] = \'\';
-\\\\$rcmail_config[\'mail_domain\'] = \'\';
-\\\\$rcmail_config[\'password_charset\'] = \'ISO-8859-1\';
-\\\\$rcmail_config[\'sendmail_delay\'] = 0;
-\\\\$rcmail_config[\'max_recipients\'] = 0; 
-\\\\$rcmail_config[\'max_group_members\'] = 0; 
-\\\\$rcmail_config[\'useragent\'] = \'Roundcube Webmail/\'.RCMAIL_VERSION;
-\\\\$rcmail_config[\'product_name\'] = \'webmail\';
-\\\\$rcmail_config[\'include_host_config\'] = false;
-\\\\$rcmail_config[\'generic_message_footer\'] = \'\';
-\\\\$rcmail_config[\'generic_message_footer_html\'] = \'\';
-\\\\$rcmail_config[\'http_received_header\'] = false;
-\\\\$rcmail_config[\'http_received_header_encrypt\'] = false;
-\\\\$rcmail_config[\'mail_header_delimiter\'] = NULL;
-\\\\$rcmail_config[\'line_length\'] = 72;
-\\\\$rcmail_config[\'send_format_flowed\'] = true;
-\\\\$rcmail_config[\'mdn_use_from\'] = false;
-\\\\$rcmail_config[\'identities_level\'] = 0;
-\\\\$rcmail_config[\'client_mimetypes\'] = null;  # null == default
-\\\\$rcmail_config[\'mime_magic\'] = null;
-\\\\$rcmail_config[\'mime_types\'] = null;
-\\\\$rcmail_config[\'im_identify_path\'] = null;
-\\\\$rcmail_config[\'im_convert_path\'] = null;
-\\\\$rcmail_config[\'image_thumbnail_size\'] = 240;
-\\\\$rcmail_config[\'contact_photo_size\'] = 160;
-\\\\$rcmail_config[\'email_dns_check\'] = false;
-\\\\$rcmail_config[\'no_save_sent_messages\'] = false;
-\\\\$rcmail_config[\'plugins\'] = array();
-\\\\$rcmail_config[\'message_sort_col\'] = \'\';
-\\\\$rcmail_config[\'message_sort_order\'] = \'DESC\';
-\\\\$rcmail_config[\'list_cols\'] = array(\'subject\', \'status\', \'fromto\', \'date\', \'size\', \'flag\', \'attachment\');
-\\\\$rcmail_config[\'language\'] = null;
-\\\\$rcmail_config[\'date_format\'] = \'Y-m-d\';
-\\\\$rcmail_config[\'date_formats\'] = array(\'Y-m-d\', \'d-m-Y\', \'Y/m/d\', \'m/d/Y\', \'d/m/Y\', \'d.m.Y\', \'j.n.Y\');
-\\\\$rcmail_config[\'time_format\'] = \'H:i\';
-\\\\$rcmail_config[\'time_formats\'] = array(\'G:i\', \'H:i\', \'g:i a\', \'h:i A\');
-\\\\$rcmail_config[\'date_short\'] = \'D H:i\';
-\\\\$rcmail_config[\'date_long\'] = \'Y-m-d H:i\';
-\\\\$rcmail_config[\'drafts_mbox\'] = \'Drafts\';
-\\\\$rcmail_config[\'junk_mbox\'] = \'Junk\';
-\\\\$rcmail_config[\'sent_mbox\'] = \'Sent\';
-\\\\$rcmail_config[\'trash_mbox\'] = \'Trash\';
-\\\\$rcmail_config[\'default_folders\'] = array(\'INBOX\', \'Drafts\', \'Sent\', \'Junk\', \'Trash\');
-\\\\$rcmail_config[\'create_default_folders\'] = false;
-\\\\$rcmail_config[\'protect_default_folders\'] = true;
-\\\\$rcmail_config[\'quota_zero_as_unlimited\'] = false;
-\\\\$rcmail_config[\'enable_spellcheck\'] = true;
-\\\\$rcmail_config[\'spellcheck_dictionary\'] = false;
-\\\\$rcmail_config[\'spellcheck_engine\'] = \'googie\';
-\\\\$rcmail_config[\'spellcheck_uri\'] = \'\';
-\\\\$rcmail_config[\'spellcheck_languages\'] = NULL;
-\\\\$rcmail_config[\'spellcheck_ignore_caps\'] = false;
-\\\\$rcmail_config[\'spellcheck_ignore_nums\'] = false;
-\\\\$rcmail_config[\'spellcheck_ignore_syms\'] = false;
-\\\\$rcmail_config[\'recipients_separator\'] = \',\';
-\\\\$rcmail_config[\'max_pagesize\'] = 200;
-\\\\$rcmail_config[\'min_refresh_interval\'] = 60;
-\\\\$rcmail_config[\'upload_progress\'] = false;
-\\\\$rcmail_config[\'undo_timeout\'] = 0;
-\\\\$rcmail_config[\'address_book_type\'] = \'sql\';
-\\\\$rcmail_config[\'ldap_public\'] = array();
-
-\\\\$rcmail_config[\'ldap_public\'][\'localhost\'] = array(
+ 
+
+  
+\$rcmail_config = array();
+\$rcmail_config[\'debug_level\'] = 1;
+\$rcmail_config[\'log_driver\'] = \'file\';
+\$rcmail_config[\'log_date_format\'] = \'d-M-Y H:i:s O\';
+\$rcmail_config[\'syslog_id\'] = \'roundcube\';
+\$rcmail_config[\'syslog_facility\'] = LOG_USER;
+\$rcmail_config[\'smtp_log\'] = true;
+\$rcmail_config[\'log_logins\'] = false;
+\$rcmail_config[\'log_session\'] = false;
+\$rcmail_config[\'sql_debug\'] = false;
+\$rcmail_config[\'imap_debug\'] = false;
+\$rcmail_config[\'ldap_debug\'] = false;
+\$rcmail_config[\'smtp_debug\'] = false;
+\$rcmail_config[\'default_host\'] = \''.$SERVER_ADDRESS_SHORT.'\';
+\$rcmail_config[\'default_port\'] = 143;
+\$rcmail_config[\'imap_auth_type\'] = PLAIN;
+\$rcmail_config[\'imap_delimiter\'] = null;
+\$rcmail_config[\'imap_ns_personal\'] = null;
+\$rcmail_config[\'imap_ns_shared\']   = null;
+\$rcmail_config[\'imap_force_caps\'] = false;
+\$rcmail_config[\'imap_force_lsub\'] = false;
+\$rcmail_config[\'imap_force_ns\'] = false;
+\$rcmail_config[\'imap_timeout\'] = 0;
+\$rcmail_config[\'imap_auth_cid\'] = null;
+\$rcmail_config[\'imap_auth_pw\'] = null;
+\$rcmail_config[\'imap_cache\'] = null;
+\$rcmail_config[\'messages_cache\'] = false;
+\$rcmail_config[\'smtp_server\'] = \'127.0.0.1\';
+\$rcmail_config[\'smtp_port\'] = 25;
+\$rcmail_config[\'smtp_user\'] = \'\';
+\$rcmail_config[\'smtp_pass\'] = \'\';
+\$rcmail_config[\'smtp_auth_type\'] = \'\';
+\$rcmail_config[\'smtp_auth_cid\'] = null;
+\$rcmail_config[\'smtp_auth_pw\'] = null;
+\$rcmail_config[\'smtp_helo_host\'] = \'\';
+\$rcmail_config[\'smtp_timeout\'] = 0;
+\$rcmail_config[\'enable_installer\'] = false;
+\$rcmail_config[\'dont_override\'] = array();
+\$rcmail_config[\'support_url\'] = \'\';
+\$rcmail_config[\'skin_logo\'] = null;
+\$rcmail_config[\'auto_create_user\'] = true;
+\$rcmail_config[\'user_aliases\'] = false;
+\$rcmail_config[\'log_dir\'] = \'logs/\';
+\$rcmail_config[\'temp_dir\'] = \'temp/\';
+\$rcmail_config[\'message_cache_lifetime\'] = \'10d\';
+\$rcmail_config[\'force_https\'] = false;
+\$rcmail_config[\'use_https\'] = false;
+\$rcmail_config[\'login_autocomplete\'] = 0;
+\$rcmail_config[\'login_lc\'] = 2;
+\$rcmail_config[\'skin_include_php\'] = false;
+\$rcmail_config[\'display_version\'] = false;
+\$rcmail_config[\'session_lifetime\'] = 10;
+\$rcmail_config[\'session_domain\'] = \'\';
+\$rcmail_config[\'session_name\'] = null;
+\$rcmail_config[\'session_path\'] = null;
+\$rcmail_config[\'session_storage\'] = \'db\';
+\$rcmail_config[\'ip_check\'] = false;
+\$rcmail_config[\'referer_check\'] = false;
+\$rcmail_config[\'x_frame_options\'] = \'sameorigin\';
+\$rcmail_config[\'des_key\'] = \'+oEkJSMxbrsl%C!J1f3AjJK-\';
+\$rcmail_config[\'username_domain\'] = \'\';
+\$rcmail_config[\'mail_domain\'] = \'\';
+\$rcmail_config[\'password_charset\'] = \'ISO-8859-1\';
+\$rcmail_config[\'sendmail_delay\'] = 0;
+\$rcmail_config[\'max_recipients\'] = 0; 
+\$rcmail_config[\'max_group_members\'] = 0; 
+\$rcmail_config[\'useragent\'] = \'Roundcube Webmail/\'.RCMAIL_VERSION;
+\$rcmail_config[\'product_name\'] = \'webmail\';
+\$rcmail_config[\'include_host_config\'] = false;
+\$rcmail_config[\'generic_message_footer\'] = \'\';
+\$rcmail_config[\'generic_message_footer_html\'] = \'\';
+\$rcmail_config[\'http_received_header\'] = false;
+\$rcmail_config[\'http_received_header_encrypt\'] = false;
+\$rcmail_config[\'mail_header_delimiter\'] = NULL;
+\$rcmail_config[\'line_length\'] = 72;
+\$rcmail_config[\'send_format_flowed\'] = true;
+\$rcmail_config[\'mdn_use_from\'] = false;
+\$rcmail_config[\'identities_level\'] = 0;
+\$rcmail_config[\'client_mimetypes\'] = null;  # null == default
+\$rcmail_config[\'mime_magic\'] = null;
+\$rcmail_config[\'mime_types\'] = null;
+\$rcmail_config[\'im_identify_path\'] = null;
+\$rcmail_config[\'im_convert_path\'] = null;
+\$rcmail_config[\'image_thumbnail_size\'] = 240;
+\$rcmail_config[\'contact_photo_size\'] = 160;
+\$rcmail_config[\'email_dns_check\'] = false;
+\$rcmail_config[\'no_save_sent_messages\'] = false;
+\$rcmail_config[\'plugins\'] = array();
+\$rcmail_config[\'message_sort_col\'] = \'\';
+\$rcmail_config[\'message_sort_order\'] = \'DESC\';
+\$rcmail_config[\'list_cols\'] = array(\'subject\', \'status\', \'fromto\', \'date\', \'size\', \'flag\', \'attachment\');
+\$rcmail_config[\'language\'] = null;
+\$rcmail_config[\'date_format\'] = \'Y-m-d\';
+\$rcmail_config[\'date_formats\'] = array(\'Y-m-d\', \'d-m-Y\', \'Y/m/d\', \'m/d/Y\', \'d/m/Y\', \'d.m.Y\', \'j.n.Y\');
+\$rcmail_config[\'time_format\'] = \'H:i\';
+\$rcmail_config[\'time_formats\'] = array(\'G:i\', \'H:i\', \'g:i a\', \'h:i A\');
+\$rcmail_config[\'date_short\'] = \'D H:i\';
+\$rcmail_config[\'date_long\'] = \'Y-m-d H:i\';
+\$rcmail_config[\'drafts_mbox\'] = \'Drafts\';
+\$rcmail_config[\'junk_mbox\'] = \'Junk\';
+\$rcmail_config[\'sent_mbox\'] = \'Sent\';
+\$rcmail_config[\'trash_mbox\'] = \'Trash\';
+\$rcmail_config[\'default_folders\'] = array(\'INBOX\', \'Drafts\', \'Sent\', \'Junk\', \'Trash\');
+\$rcmail_config[\'create_default_folders\'] = false;
+\$rcmail_config[\'protect_default_folders\'] = true;
+\$rcmail_config[\'quota_zero_as_unlimited\'] = false;
+\$rcmail_config[\'enable_spellcheck\'] = true;
+\$rcmail_config[\'spellcheck_dictionary\'] = false;
+\$rcmail_config[\'spellcheck_engine\'] = \'googie\';
+\$rcmail_config[\'spellcheck_uri\'] = \'\';
+\$rcmail_config[\'spellcheck_languages\'] = NULL;
+\$rcmail_config[\'spellcheck_ignore_caps\'] = false;
+\$rcmail_config[\'spellcheck_ignore_nums\'] = false;
+\$rcmail_config[\'spellcheck_ignore_syms\'] = false;
+\$rcmail_config[\'recipients_separator\'] = \',\';
+\$rcmail_config[\'max_pagesize\'] = 200;
+\$rcmail_config[\'min_refresh_interval\'] = 60;
+\$rcmail_config[\'upload_progress\'] = false;
+\$rcmail_config[\'undo_timeout\'] = 0;
+\$rcmail_config[\'address_book_type\'] = \'sql\';
+\$rcmail_config[\'ldap_public\'] = array();
+
+\$rcmail_config[\'ldap_public\'][\'localhost\'] = array(
   \'name\' => \'localhost\',
   \'hosts\' => array(\'127.0.0.1\'),
   \'port\' => 389,
@@ -964,85 +967,85 @@ chown _www logs/ || exit 1
   \'fuzzy_search\' => true
 );
 
-\\\\$rcmail_config[\'autocomplete_addressbooks\'] = array(\'sql\',\'localhost\');
-\\\\$rcmail_config[\'autocomplete_min_length\'] = 1;
-\\\\$rcmail_config[\'autocomplete_threads\'] = 0;
-\\\\$rcmail_config[\'autocomplete_max\'] = 15;
-\\\\$rcmail_config[\'address_template\'] = \'{street}<br/>{locality} {zipcode}<br/>{country} {region}\';
-\\\\$rcmail_config[\'addressbook_search_mode\'] = 0;
-\\\\$rcmail_config[\'default_charset\'] = \'ISO-8859-1\';
-\\\\$rcmail_config[\'skin\'] = \'larry\';
-\\\\$rcmail_config[\'mail_pagesize\'] = 50;
-\\\\$rcmail_config[\'addressbook_pagesize\'] = 50;
-\\\\$rcmail_config[\'addressbook_sort_col\'] = \'surname\';
-\\\\$rcmail_config[\'addressbook_name_listing\'] = 0;
-\\\\$rcmail_config[\'timezone\'] = \'auto\';
-\\\\$rcmail_config[\'prefer_html\'] = true;
-\\\\$rcmail_config[\'show_images\'] = 0;
-\\\\$rcmail_config[\'message_extwin\'] = false;
-\\\\$rcmail_config[\'compose_extwin\'] = false;
-\\\\$rcmail_config[\'htmleditor\'] = 0;
-\\\\$rcmail_config[\'prettydate\'] = true;
-\\\\$rcmail_config[\'draft_autosave\'] = 300;
-\\\\$rcmail_config[\'preview_pane\'] = false;
-\\\\$rcmail_config[\'preview_pane_mark_read\'] = 0;
-\\\\$rcmail_config[\'logout_purge\'] = false;
-\\\\$rcmail_config[\'logout_expunge\'] = false;
-\\\\$rcmail_config[\'inline_images\'] = true;
-\\\\$rcmail_config[\'mime_param_folding\'] = 0;
-\\\\$rcmail_config[\'skip_deleted\'] = false;
-\\\\$rcmail_config[\'read_when_deleted\'] = true;
-\\\\$rcmail_config[\'flag_for_deletion\'] = false;
-\\\\$rcmail_config[\'refresh_interval\'] = 60;
-\\\\$rcmail_config[\'check_all_folders\'] = false;
-\\\\$rcmail_config[\'display_next\'] = true;
-\\\\$rcmail_config[\'autoexpand_threads\'] = 0;
-\\\\$rcmail_config[\'reply_mode\'] = 0;
-\\\\$rcmail_config[\'strip_existing_sig\'] = true;
-\\\\$rcmail_config[\'show_sig\'] = 1;
-\\\\$rcmail_config[\'force_7bit\'] = false;
-\\\\$rcmail_config[\'delete_always\'] = false;
-\\\\$rcmail_config[\'delete_junk\'] = false;
-\\\\$rcmail_config[\'mdn_requests\'] = 0;
-\\\\$rcmail_config[\'mdn_default\'] = 0;
-\\\\$rcmail_config[\'dsn_default\'] = 0;
-\\\\$rcmail_config[\'reply_same_folder\'] = false;
-\\\\$rcmail_config[\'forward_attachment\'] = false;
-\\\\$rcmail_config[\'default_addressbook\'] = null;
-\\\\$rcmail_config[\'spellcheck_before_send\'] = false;
-\\\\$rcmail_config[\'autocomplete_single\'] = false;
-\\\\$rcmail_config[\'default_font\'] = \'\'; 
+\$rcmail_config[\'autocomplete_addressbooks\'] = array(\'sql\',\'localhost\');
+\$rcmail_config[\'autocomplete_min_length\'] = 1;
+\$rcmail_config[\'autocomplete_threads\'] = 0;
+\$rcmail_config[\'autocomplete_max\'] = 15;
+\$rcmail_config[\'address_template\'] = \'{street}<br/>{locality} {zipcode}<br/>{country} {region}\';
+\$rcmail_config[\'addressbook_search_mode\'] = 0;
+\$rcmail_config[\'default_charset\'] = \'ISO-8859-1\';
+\$rcmail_config[\'skin\'] = \'larry\';
+\$rcmail_config[\'mail_pagesize\'] = 50;
+\$rcmail_config[\'addressbook_pagesize\'] = 50;
+\$rcmail_config[\'addressbook_sort_col\'] = \'surname\';
+\$rcmail_config[\'addressbook_name_listing\'] = 0;
+\$rcmail_config[\'timezone\'] = \'auto\';
+\$rcmail_config[\'prefer_html\'] = true;
+\$rcmail_config[\'show_images\'] = 0;
+\$rcmail_config[\'message_extwin\'] = false;
+\$rcmail_config[\'compose_extwin\'] = false;
+\$rcmail_config[\'htmleditor\'] = 0;
+\$rcmail_config[\'prettydate\'] = true;
+\$rcmail_config[\'draft_autosave\'] = 300;
+\$rcmail_config[\'preview_pane\'] = false;
+\$rcmail_config[\'preview_pane_mark_read\'] = 0;
+\$rcmail_config[\'logout_purge\'] = false;
+\$rcmail_config[\'logout_expunge\'] = false;
+\$rcmail_config[\'inline_images\'] = true;
+\$rcmail_config[\'mime_param_folding\'] = 0;
+\$rcmail_config[\'skip_deleted\'] = false;
+\$rcmail_config[\'read_when_deleted\'] = true;
+\$rcmail_config[\'flag_for_deletion\'] = false;
+\$rcmail_config[\'refresh_interval\'] = 60;
+\$rcmail_config[\'check_all_folders\'] = false;
+\$rcmail_config[\'display_next\'] = true;
+\$rcmail_config[\'autoexpand_threads\'] = 0;
+\$rcmail_config[\'reply_mode\'] = 0;
+\$rcmail_config[\'strip_existing_sig\'] = true;
+\$rcmail_config[\'show_sig\'] = 1;
+\$rcmail_config[\'force_7bit\'] = false;
+\$rcmail_config[\'delete_always\'] = false;
+\$rcmail_config[\'delete_junk\'] = false;
+\$rcmail_config[\'mdn_requests\'] = 0;
+\$rcmail_config[\'mdn_default\'] = 0;
+\$rcmail_config[\'dsn_default\'] = 0;
+\$rcmail_config[\'reply_same_folder\'] = false;
+\$rcmail_config[\'forward_attachment\'] = false;
+\$rcmail_config[\'default_addressbook\'] = null;
+\$rcmail_config[\'spellcheck_before_send\'] = false;
+\$rcmail_config[\'autocomplete_single\'] = false;
+\$rcmail_config[\'default_font\'] = \'\'; 
 " > config/main.inc.php 
  ';
 
 $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/webmail || exit 1
 echo "<?
-\\\\$rcmail_config = array();
-\\\\$rcmail_config[\'db_dsnw\'] = \'mysql://webmail:webmail666@127.0.0.1/webmail\';
-\\\\$rcmail_config[\'db_dsnr\'] = \'\';
-\\\\$rcmail_config[\'db_persistent\'] = false;
+\$rcmail_config = array();
+\$rcmail_config[\'db_dsnw\'] = \'mysql://webmail:webmail666@127.0.0.1/webmail\';
+\$rcmail_config[\'db_dsnr\'] = \'\';
+\$rcmail_config[\'db_persistent\'] = false;
 
 // you can define specific table names used to store webmail data
-\\\\$rcmail_config[\'db_table_users\'] = \'users\';
-\\\\$rcmail_config[\'db_table_identities\'] = \'identities\';
-\\\\$rcmail_config[\'db_table_contacts\'] = \'contacts\';
-\\\\$rcmail_config[\'db_table_contactgroups\'] = \'contactgroups\';
-\\\\$rcmail_config[\'db_table_contactgroupmembers\'] = \'contactgroupmembers\';
-\\\\$rcmail_config[\'db_table_session\'] = \'session\';
-\\\\$rcmail_config[\'db_table_cache\'] = \'cache\';
-\\\\$rcmail_config[\'db_table_cache_index\'] = \'cache_index\';
-\\\\$rcmail_config[\'db_table_cache_thread\'] = \'cache_thread\';
-\\\\$rcmail_config[\'db_table_cache_messages\'] = \'cache_messages\';
-\\\\$rcmail_config[\'db_table_dictionary\'] = \'dictionary\';
-\\\\$rcmail_config[\'db_table_searches\'] = \'searches\';
-\\\\$rcmail_config[\'db_table_system\'] = \'system\';
+\$rcmail_config[\'db_table_users\'] = \'users\';
+\$rcmail_config[\'db_table_identities\'] = \'identities\';
+\$rcmail_config[\'db_table_contacts\'] = \'contacts\';
+\$rcmail_config[\'db_table_contactgroups\'] = \'contactgroups\';
+\$rcmail_config[\'db_table_contactgroupmembers\'] = \'contactgroupmembers\';
+\$rcmail_config[\'db_table_session\'] = \'session\';
+\$rcmail_config[\'db_table_cache\'] = \'cache\';
+\$rcmail_config[\'db_table_cache_index\'] = \'cache_index\';
+\$rcmail_config[\'db_table_cache_thread\'] = \'cache_thread\';
+\$rcmail_config[\'db_table_cache_messages\'] = \'cache_messages\';
+\$rcmail_config[\'db_table_dictionary\'] = \'dictionary\';
+\$rcmail_config[\'db_table_searches\'] = \'searches\';
+\$rcmail_config[\'db_table_system\'] = \'system\';
 
 // you can define specific sequence names used in PostgreSQL
-\\\\$rcmail_config[\'db_sequence_users\'] = \'user_ids\';
-\\\\$rcmail_config[\'db_sequence_identities\'] = \'identity_ids\';
-\\\\$rcmail_config[\'db_sequence_contacts\'] = \'contact_ids\';
-\\\\$rcmail_config[\'db_sequence_contactgroups\'] = \'contactgroups_ids\';
-\\\\$rcmail_config[\'db_sequence_searches\'] = \'search_ids\';
+\$rcmail_config[\'db_sequence_users\'] = \'user_ids\';
+\$rcmail_config[\'db_sequence_identities\'] = \'identity_ids\';
+\$rcmail_config[\'db_sequence_contacts\'] = \'contact_ids\';
+\$rcmail_config[\'db_sequence_contactgroups\'] = \'contactgroups_ids\';
+\$rcmail_config[\'db_sequence_searches\'] = \'search_ids\';
 // end db config file
 " > config/db.inc.php';
 
@@ -1054,7 +1057,7 @@ return $cmd;
 }
  
 
-function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 //@2014-09 sqix: po co kasowac - to niebezpieczne?! $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/SE/ && rm -R /Library/Server/Web/Data/Sites/Default/SE || echo PASSED';
  //!!! Instalacja i generowanie konfiga - kopiowanie
   $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/SE || echo PASSED '; //zalozenie katalogow
@@ -1085,8 +1088,9 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/.config_base_structure.php','/Library/Server/Web/Data/Sites/Default/SE/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
 
   
-  $cmd[]['scp_root']=array($INSTALL_ROOT.'/config/.cnf--column_init*','/Library/Server/Web/Data/Sites/Default/SE/config/');  
-  $cmd[]['scp_root']=array($INSTALL_ROOT.'/config/.cnf--external_ids.ini.php*','/Library/Server/Web/Data/Sites/Default/SE/config/');  
+  $cmd[]['scp_root']=array($OPTIONS->SE_config.'/config/.cnf--column_init*','/Library/Server/Web/Data/Sites/Default/SE/config/');  
+ 
+  $cmd[]['scp_root']=array($OPTIONS->SE_config.'/config/.cnf--external_ids.ini.php*','/Library/Server/Web/Data/Sites/Default/SE/config/');  
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/.config.php','/Library/Server/Web/Data/Sites/Default/SE/');  
     $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/procesy || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/procesy','/Library/Server/Web/Data/Sites/Default/SE/');  
@@ -1141,7 +1145,7 @@ return $cmd;
 }
 
 
-function INSTALL_GETCOMMANDS_SE_DB_DOMAIN_UNINSTALL($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+function INSTALL_GETCOMMANDS_SE_DB_DOMAIN_UNINSTALL($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 //always before install mysql (if option to use)
 
 
@@ -1149,7 +1153,7 @@ return $cmd;
 
 }
 
-function INSTALL_GETCOMMANDS_SE_DB_DOMAIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+function INSTALL_GETCOMMANDS_SE_DB_DOMAIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 //after always should be run INSTALL_GETCOMMANDS_SE
   $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/SE || echo PASSED '; //zalozenie katalogow
   //! .cnf--default_db
@@ -1464,7 +1468,7 @@ return $cmd;
 
 
 
-function INSTALL_GETCOMMANDS_MYADMIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION) {
+function INSTALL_GETCOMMANDS_MYADMIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz || echo PASSED';
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/garbage && rm -R /Library/Server/Web/Data/Sites/Default/garbage || echo PASSED';
 //! phpMyAdmin garbage
@@ -1475,22 +1479,22 @@ function INSTALL_GETCOMMANDS_MYADMIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_U
  mv phpMyAdmin-* garbage || exit 1 ';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/garbage || exit 1 
 echo "<?
-\\\\\$i = 0;
-\\\\\$i++;
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'verbose\'] = \''.$SERVER_ADDRESS.'\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'host\'] = \'127.0.0.1\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'port\'] = \'\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'socket\'] = \'\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'connect_type\'] = \'tcp\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'extension\'] = \'mysqli\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'auth_type\'] = \'cookie\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'user\'] = \'root\';
-\\\\\$cfg[\'Servers\'][\\\\\$i][\'password\'] = \'\';
-\\\\\$cfg[\'blowfish_secret\'] = \'51bc5c5b538ff0.23201365\';
-\\\\\$cfg[\'DefaultLang\'] = \'en\';
-\\\\\$cfg[\'ServerDefault\'] = 1;
-\\\\\$cfg[\'UploadDir\'] = \'\';
-\\\\\$cfg[\'SaveDir\'] = \'\';
+\\$i = 0;
+\\$i++;
+\\$cfg[\'Servers\'][\\$i][\'verbose\'] = \''.$SERVER_ADDRESS.'\';
+\\$cfg[\'Servers\'][\\$i][\'host\'] = \'127.0.0.1\';
+\\$cfg[\'Servers\'][\\$i][\'port\'] = \'\';
+\\$cfg[\'Servers\'][\\$i][\'socket\'] = \'\';
+\\$cfg[\'Servers\'][\\$i][\'connect_type\'] = \'tcp\';
+\\$cfg[\'Servers\'][\\$i][\'extension\'] = \'mysqli\';
+\\$cfg[\'Servers\'][\\$i][\'auth_type\'] = \'cookie\';
+\\$cfg[\'Servers\'][\\$i][\'user\'] = \'root\';
+\\$cfg[\'Servers\'][\\$i][\'password\'] = \'\';
+\\$cfg[\'blowfish_secret\'] = \'51bc5c5b538ff0.23201365\';
+\\$cfg[\'DefaultLang\'] = \'en\';
+\\$cfg[\'ServerDefault\'] = 1;
+\\$cfg[\'UploadDir\'] = \'\';
+\\$cfg[\'SaveDir\'] = \'\';
 ?>
 " > config.inc.php || exit 1 
 
@@ -1500,7 +1504,7 @@ echo "<?
 return $cmd;
 }
 
-function INSTALL_GET_INIT_APPLE_XML($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD)  {
+function INSTALL_GET_INIT_APPLE_XML($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS)  {
 return '"<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"
 \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
@@ -1706,6 +1710,8 @@ function MAKE_PKG_COMPONENT($h,$installer_dir_tar,$installer_url,$installer_tmp,
 
 function INSTALL_SES_PROCESY_A() {
   $INSTALL_ROOT='/Users/plabudda/se-dev-pl/SE'; //glowny katalog ze zrodlem SE
+  $INSTALL_ROOT='/Library/Server/Web/Data/Sites/SE-production-git/SE'; //glowny katalog ze zrodlem SE
+  $OPTIONS->SE_config='/Library/Server/Web/Data/Sites/SE-config'; //glowny katalog z konfigami
 //DB::query('update SES_PROCESY5_A set INSTALL_COMPLETE_POINT=0 ');
 //TODO@2013-10-05 - należy dorobić obsługę ADMIN_USERNAME_INITIAL_PASSWD aby jednorazowo się zalogowało i zmieniło na ADMIN_USERNAME_PASSWD (jakis hash) i jego juz potem wszedzie uzywalo - aby klient go nie znal
 
@@ -1772,7 +1778,7 @@ function INSTALL_SES_PROCESY_A() {
 		";
 		
 		// 	$ldap_dc_generated=implode(',dc=',explode("",$h->SERVER_ADDRESS));
-	$needed=array($h->ADMIN_USERNAME,$h->SERVER_ADDRESS_IP,$h->ADMIN_USERNAME_PASSWD,$h->SERVER_ADDRESS,$h->SERVER_ADDRESS_LDAP_DC,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$h->ADMIN_USERNAME_L1,$h->ADMIN_USERNAME_L1_PASS,$h->ADMIN_USERNAME_DIRECTORY,$h->SERVER_VERSION);
+	$needed=array($h->ADMIN_USERNAME,$h->SERVER_ADDRESS_IP,$h->ADMIN_USERNAME_PASSWD,$h->SERVER_ADDRESS,$h->SERVER_ADDRESS_LDAP_DC,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$h->ADMIN_USERNAME_L1,$h->ADMIN_USERNAME_L1_PASS,$h->ADMIN_USERNAME_DIRECTORY,$h->SERVER_VERSION,$OPTIONS);
 	foreach($needed as $ind=>$need) {
 		if(empty($need)) { echo 'Brak ustalonej jednej z wymaganych zmiennych w ustawieniach instalacyjnych serwera ('.$ind.')' ;
 			die();

SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -287,7 +287,7 @@ $config_base_structure=".config_base_structure.php";
 						 
 
 //! set tables used to generate main structure
-$TABLES_STRUCTURE=array('SALES_PLAN','SALES_PLAN_HIST','ITEM_LINK_TYPES','ITEM_LINK_TYPES_HIST','ITEM_LINKS','ITEM_LINKS_HIST','TEST_PERMS','TEST_PERMS_HIST','DEVICES','_CRM_PROCES_INIT_STATS','_CRM_PROCES_USER_STATS_wiev','BUILDINGS','BUILDINGS_HIST','SES_VOIP_A','SES_VOIP_A_HIST','SES_TV_A','SES_TV_A_HIST','USERS2_DEALS','USERS2_DEALS_HIST','DEALS_TABLE','DEALS_TABLE_HIST','USERS2_MARKETING','USERS2_MARKETING_HIST','IN7_MK_BAZA_DYSTRYBUCJI','IN7_MK_BAZA_DYSTRYBUCJI_HIST','TELBOXES','TELBOXES_HIST','NETWORKS_SERVERS','NETWORKS_SERVERS_HIST','ADMIN_USERS','ADMIN_USERS_HIST','CRM_IMPORT_TRANSLATE','IN7_PRODUKTY_CECHY','IN7_CECHY','CRM_AUTH_PROFILE','CRM_AUTH_PROFILE_HIST','CRM_CZYNNOSCI','CRM_CZYNNOSCI_HIST','CRM_IMAGE','CRM_LISTA_ZASOBOW','CRM_LISTA_ZASOBOW_HIST','CRM_PROCES','CRM_PROCES_HIST','CRM_PROCES_LOG','CRM_PROCES_LOG_HIST','CRM_PRZYPADEK','CRM_TESTY','CRM_TESTY_HIST','CRM_TESTY_ODPOWIEDZI','CRM_TESTY_ODPOWIEDZI_HIST','CRM_TESTY_PYTANIA','CRM_TESTY_PYTANIA_HIST','CRM_TESTY_WYNIKI','CRM_TESTY_WYNIKI_HIST','CRM_WSKAZNIK','CRM_WSKAZNIK_HIST','DEVICES_HIST','IN7_DZIENNIK_KORESP','IN7_DZIENNIK_KORESP_HIST','USERS2_OFFERS','USERS2_OFFERS_HIST','USERS2_OFFERS_GROUPS','USERS2_OFFERS_GROUPS_HIST','USERS2_OFFERS_COSTS','USERS2_OFFERS_COSTS_HIST','USERS2_OFFERS_COSTS','USERS2_OFFERS_COSTS_HIST','SERVICES','SES_USERS2_A','USERS2','KIKE_AUTH_PROFILE','LDAP_GROUPS','CRM_TESTY_PYTANIA_TO_IMPORT','CRM_TESTY_PYTANIA_TO_IMPORT_HIST','PROBLEMS','PROBLEMS_HIST','COMPANIES','COMPANIES_HIST','_CRM_PROCES_STATS_proc_wiev','_CRM_PROCES_STATS','CRM_PROCES_USER_OCENA_OKRES','CRM_PROCES_USER_OCENA_OKRES_HIST','_CRM_PROCES_USER_STATS_wiev_to_group');
+$TABLES_STRUCTURE=array('DEVICES_GROUP','GRAFIK_PRACY','GRAFIK_PRACY_HIST','GRAFIK_PRACY_view','SALES_PLAN','SALES_PLAN_HIST','ITEM_LINK_TYPES','ITEM_LINK_TYPES_HIST','ITEM_LINKS','ITEM_LINKS_HIST','TEST_PERMS','TEST_PERMS_HIST','DEVICES','_CRM_PROCES_INIT_STATS','_CRM_PROCES_USER_STATS_wiev','BUILDINGS','BUILDINGS_HIST','SES_VOIP_A','SES_VOIP_A_HIST','SES_TV_A','SES_TV_A_HIST','USERS2_DEALS','USERS2_DEALS_HIST','DEALS_TABLE','DEALS_TABLE_HIST','USERS2_MARKETING','USERS2_MARKETING_HIST','IN7_MK_BAZA_DYSTRYBUCJI','IN7_MK_BAZA_DYSTRYBUCJI_HIST','TELBOXES','TELBOXES_HIST','NETWORKS_SERVERS','NETWORKS_SERVERS_HIST','ADMIN_USERS','ADMIN_USERS_HIST','CRM_IMPORT_TRANSLATE','IN7_PRODUKTY_CECHY','IN7_CECHY','CRM_AUTH_PROFILE','CRM_AUTH_PROFILE_HIST','CRM_CZYNNOSCI','CRM_CZYNNOSCI_HIST','CRM_IMAGE','CRM_LISTA_ZASOBOW','CRM_LISTA_ZASOBOW_HIST','CRM_PROCES','CRM_PROCES_HIST','CRM_PROCES_LOG','CRM_PROCES_LOG_HIST','CRM_PRZYPADEK','CRM_TESTY','CRM_TESTY_HIST','CRM_TESTY_ODPOWIEDZI','CRM_TESTY_ODPOWIEDZI_HIST','CRM_TESTY_PYTANIA','CRM_TESTY_PYTANIA_HIST','CRM_TESTY_WYNIKI','CRM_TESTY_WYNIKI_HIST','CRM_WSKAZNIK','CRM_WSKAZNIK_HIST','DEVICES_HIST','IN7_DZIENNIK_KORESP','IN7_DZIENNIK_KORESP_HIST','USERS2_OFFERS','USERS2_OFFERS_HIST','USERS2_OFFERS_GROUPS','USERS2_OFFERS_GROUPS_HIST','USERS2_OFFERS_COSTS','USERS2_OFFERS_COSTS_HIST','USERS2_OFFERS_COSTS','USERS2_OFFERS_COSTS_HIST','SERVICES','SES_USERS2_A','USERS2','KIKE_AUTH_PROFILE','LDAP_GROUPS','CRM_TESTY_PYTANIA_TO_IMPORT','CRM_TESTY_PYTANIA_TO_IMPORT_HIST','PROBLEMS','PROBLEMS_HIST','COMPANIES','COMPANIES_HIST','_CRM_PROCES_STATS_proc_wiev','_CRM_PROCES_STATS','CRM_PROCES_USER_OCENA_OKRES','CRM_PROCES_USER_OCENA_OKRES_HIST','_CRM_PROCES_USER_STATS_wiev_to_group');
 $TABLES_STRUCTURE_DATA=array('CRM_PRZYPADEK');
 
 DEBUG_S(-3,'Lacze z bazami param: REMOTE_DB_ZASOB_ID',array($REMOTE_DB_ZASOB_ID,$CNF_ZASOB[$REMOTE_DB_ZASOB_ID]['INTERFACE_ADDR'],$CNF_ZASOB[$REMOTE_DB_ZASOB_ID]['SQL_USER'],$CNF_ZASOB[$REMOTE_DB_ZASOB_ID]['SQL_DATABASE']),__FILE__,__FUNCTION__,__LINE__ );

SE/superedit-SYNC_DATABASES.php

@@ -223,7 +223,8 @@ $sd->set_remote_db_id(13102);
 
 
 
-$sd->set_table_to_sync('Kabel_TPSA_dzierzawa');
+$sd->set_table_to_sync('solectwa_poligon'); //
+$sd->set_table_to_sync('Kabel_TPSA_dzierzawa'); //
 $sd->set_table_to_sync('Rozdzielcza_Przeciski_110mm');
 $sd->set_table_to_sync('Rozdzielcza_Wykop_przedmiar_na_mikrorurki');
 $sd->set_table_to_sync('Rozdzielcza_Zabruki');

SE/superedit-USERS2_WINDYKACJA_STATUS.php

@@ -741,6 +741,7 @@ if (V::get('DBG', '', $_GET, 'int') > 0) {// TODO: TEST
 			//}
 			// phone contact
 			$phone_status_info = WindykacjaStatsHelper::get_phone_status_info($user);
+			$sms_status_info = WindykacjaStatsHelper::get_sms_status_info($user);
 			$frm_errors = array();
 			$frm_msgs = array();
 			if (1 == V::get('phone_contact_save', 0, $_POST, 'int')) {
@@ -759,6 +760,22 @@ if (V::get('DBG', '', $_GET, 'int') > 0) {// TODO: TEST
 					}
 				}
 			}
+			if (1 == V::get('sms_contact_save', 0, $_POST, 'int')) {
+				if ('' == ($sms_status = V::get('sms_status', '', $_POST))) {
+					$frm_errors[] = "Nic nie zaznaczono!";
+				} else {
+					if (!array_key_exists($sms_status, $sms_status_info)) {
+						$frm_errors[] = "Nieprawidłowa wartość!";
+					} else {
+						$ret = WindykacjaStatsHelper::update_sms_status($user, $sms_status);
+						if ($ret) {
+							$frm_msgs[] = "Dane zapisano pomyślnie";
+						} else {
+							$frm_errors[] = "Wystąpił błąd podczas zapisu danych";
+						}
+					}
+				}
+			}
 			// add old id_koresp to hist (events)
 			if (1 == V::get('contact_add_id_koresp_save', 0, $_POST, 'int')) {
 				if (($id_koresp = V::get('id_koresp', '', $_POST, 'int')) <= 0) {
@@ -789,6 +806,27 @@ function frm_kontakt_phone_submit_callback(frm){
 	}
 	return false;
 }
+function frm_kontakt_sms_submit_callback(frm){
+	var len=frm.sms_status.length;
+	var val='';
+	if (!len && frm.sms_status.type && frm.sms_status.type == 'radio') {
+		if (frm.sms_status.checked) {
+		val = frm.sms_status[i].value;
+		}
+	} else {
+		for(var i=0; i < len; i++){
+			if(frm.sms_status[i].checked){
+				var val = frm.sms_status[i].value;
+			}
+		}
+	}
+	if (val!='') {
+		return true;
+	} else {
+		alert('Nic nie zaznaczono.');
+	}
+	return false;
+}
 function frm_kontakt_add_id_koresp(frm){
 	var val=frm.id_koresp.value;
 	if (val!='') {
@@ -806,7 +844,6 @@ function frm_kontakt_add_id_koresp(frm){
 				if (!empty($frm_msgs)) {
 					echo'<p style="color:green">' . implode('<br />', $frm_msgs) . '</p>';
 				}
-				echo'<form action="" method="post" onsubmit="' . "return frm_kontakt_phone_submit_callback(this);" . '">';
 				echo '<table cellspacing="0" cellpadding="0" border="0" class="tbl-td-top"><tr>';
 				echo '<td style="padding:0 20px 0 0;color:blue;">';
 					echo'<img src="' . "icon/phone.png" . '" alt="tel"  />';
@@ -816,18 +853,30 @@ function frm_kontakt_add_id_koresp(frm){
 					echo " Co ustalono: ";
 				echo '</td>';
 				echo '<td>';
+					echo'<form action="" method="post" onsubmit="' . "return frm_kontakt_phone_submit_callback(this);" . '">';
 					echo'<div id="'."kontakt-phone".'">';
 						echo'<input type="hidden" name="'."phone_contact_save".'" value="'."1".'" />';
 						foreach ($phone_status_info as $k_type => $v_info) {
 							echo'<input type="radio" name="'."phone_status".'" value="' . $k_type . '" />'; echo " " . $v_info['label'] . " " . $v_info['date'] . '<br />';
 						}
 					echo'</div>';
+					echo'<input type="submit" value="'."zapisz".'" />';
+					echo'</form>';
+				echo '</td>';
+				echo '<td style="width:40px">';
 				echo '</td>';
 				echo '<td>';
+					echo'<form action="" method="post" onsubmit="' . "return frm_kontakt_sms_submit_callback(this);" . '">';
+					echo'<div id="'."kontakt-sms".'">';
+						echo'<input type="hidden" name="'."sms_contact_save".'" value="'."1".'" />';
+						foreach ($sms_status_info as $k_type => $v_info) {
+							echo'<input type="radio" name="'."sms_status".'" value="' . $k_type . '" />'; echo " {$v_info['label']}:<br> {$v_info['msg']}" . '<br />';
+						}
+					echo'</div>';
 					echo'<input type="submit" value="'."zapisz".'" />';
+					echo'</form>';
 				echo '</td>';
 				echo '</tr></table>';
-				echo'</form>';
 			echo'</div>';// .box
 
 			echo'<div class="box" style="margin:6px 0;border-color:#666;">';
@@ -1670,8 +1719,11 @@ body{font-family:arial;}
 						// TODO: podglad faktury
 						//if ($h['type'] == 'FVAT') $out_tr['ID'] .= ' <a href="'."?MENU_INIT=USERS2_WINDYKACJA_STATUS&_user_id=".$user->ID."&task=view_faktura&id=".$h['ID'].'" target="_blank">'.'<img src="'."icon/search.png".'" alt="'."U".'" title="'."Podgląd faktury".'" />'.'</a>';
 					}
-					$out_tr['ID'] .= ' <code style="font-size:10px">'."(".$v_doc->get('ID').")".'</code>';// TODO: dla KP,KW: ID_BILLING_NUMBERS zamiast ID
-					$out_tr['nr'] = $v_doc->get('nr');
+					$docNr = $v_doc->get('nr');
+					if ('FVAT' == $v_doc->get_type()) {
+						$out_tr['ID'] .= ' <a href="index.php?FUNCTION_INIT=bm_show_document&ARG1_VAL=' . $docNr . '" target="_blank">'."({$docNr})".'</a>';
+					}
+					$out_tr['nr'] = $docNr;
 					$out_tr['winien'] = number_format($v_doc->get('WINIEN'), 2, ',', ' ');
 					$out_tr['ma'] = number_format($v_doc->get('MA'), 2, ',', ' ');
 					$out_tr['saldo'] = number_format($v_doc->get_saldo(), 2, ',', ' ');
@@ -1749,29 +1801,39 @@ body{font-family:arial;}
 					else if ($v_doc->get_type() == 'HIST_PHONE') {
 						$date = $v_doc->get('PAY_TERM');
 						if ($date == 'N/S;') $date = '';
-						switch ($v_doc->get('LAST_PHONE_STATUS')) {
-							case 'nie_zaplaci':
-								$out_tr['add'] = "nie zapłaci";
-								break;
-
-							case 'zaplaci_w_terminie':
-								$out_tr['add'] = "zapłaci w terminie " . $date . " " . '<em style="font-size:small;">' . "(ustalono " . $v_doc->get('A_RECORD_UPDATE_DATE') . ")" . '</em>';
-								break;
-
-							case 'zaplaci_za_1mc':
-								$out_tr['add'] = "zapłaci miesiąc później " . $date . " " . '<em style="font-size:small;">' . "(ustalono " . $v_doc->get('A_RECORD_UPDATE_DATE') . ")" . '</em>';
-								break;
-
-							case 'zaplaci_za_2mc':
-								$out_tr['add'] = "zapłaci 2 miesiące później " . $date . " " . '<em style="font-size:small;">' . "(ustalono " . $v_doc->get('A_RECORD_UPDATE_DATE') . ")" . '</em>';
-								break;
-
-							case 'zaplaci_za_3mc':
-								$out_tr['add'] = "zapłaci 3 miesiące później " . $date . " " . '<em style="font-size:small;">' . "(ustalono " . $v_doc->get('A_RECORD_UPDATE_DATE') . ")" . '</em>';
-								break;
-
-							default:
-								$out_tr['add'] = "kontakt z klientem: " . $v_doc->get('LAST_PHONE_STATUS') . " " . '<em style="font-size:small;">' . "(ustalono " . $v_doc->get('A_RECORD_UPDATE_DATE') . ")" . '</em>';
+						$lastPhoneStatus = $v_doc->get('LAST_PHONE_STATUS');
+						if ($lastPhoneStatus == 'N/S;') $lastPhoneStatus = '';
+						$lastSmsStatus = $v_doc->get('LAST_SMS_STATUS');
+						if ($lastSmsStatus == 'N/S;') $lastSmsStatus = '';
+						$lastUpdateDate = $v_doc->get('A_RECORD_UPDATE_DATE');
+						if (!empty($lastPhoneStatus)) {
+							switch ($lastPhoneStatus) {
+								case 'nie_zaplaci':
+									$out_tr['add'] = "nie zapłaci";
+									break;
+
+								case 'zaplaci_w_terminie':
+									$out_tr['add'] = "zapłaci w terminie {$date} " . '<em style="font-size:small;">' . "(ustalono {$lastUpdateDate})" . '</em>';
+									break;
+
+								case 'zaplaci_za_1mc':
+									$out_tr['add'] = "zapłaci miesiąc później {$date} " . '<em style="font-size:small;">' . "(ustalono {$lastUpdateDate})" . '</em>';
+									break;
+
+								case 'zaplaci_za_2mc':
+									$out_tr['add'] = "zapłaci 2 miesiące później {$date} " . '<em style="font-size:small;">' . "(ustalono {$lastUpdateDate})" . '</em>';
+									break;
+
+								case 'zaplaci_za_3mc':
+									$out_tr['add'] = "zapłaci 3 miesiące później {$date} " . '<em style="font-size:small;">' . "(ustalono {$lastUpdateDate})" . '</em>';
+									break;
+
+								default:
+									$out_tr['add'] = "kontakt z klientem: {$lastPhoneStatus} " . '<em style="font-size:small;">' . "(ustalono {$lastUpdateDate})" . '</em>';
+							}
+						} else if (!empty($lastSmsStatus)) {
+							$lastSmsId = $v_doc->get('LAST_SMS_MSG_ID');
+							$out_tr['add'] = "SMS: {$lastSmsStatus} " . '<em style="font-size:small;" title="' . "(wysłano {$lastUpdateDate}, {$lastSmsId})" . '">' . "(wysłano {$lastUpdateDate})" . '</em>';
 						}
 					} else if ($v_doc->get_type() == 'HIST_BAD_ADDRESS') {
 						if ($v_doc->get('BAD_ADDRESS')) {
@@ -3192,7 +3254,7 @@ class WindykacjaStatsHelper {
 	 * 
 	 * @returns array of 'label', 'date' -> nowy PAY_TERM ustalony wg. aktualnego stanu
 	 */
-	public static function &get_phone_status_info(&$user) {
+	public static function get_phone_status_info($user) {
 		$ret = array();
 		$ret['nie_zaplaci'] = array('label'=>"nie zapłaci", 'date'=>'');
 		$today = date("Y-m-d");
@@ -3235,6 +3297,23 @@ class WindykacjaStatsHelper {
 		return $ret;
 	}
 
+	public static function get_sms_status_info($user) {
+		$ret = array();
+		$today = date("Y-m-d");
+		$due_date = $user->PAY_TERM;// ustalowny pay term
+		$zaleglosc = number_format($user->PAY_SALDO, 2, ',', '');
+		if ($user->PAY_SALDO < 0) {
+			$msg = "Twoje saldo na dzien {$today} wynosi {$zaleglosc} zl.\n";
+			$msg .= "Prosimy o niezwloczne uregulowanie zaleglosci.";
+			if ($due_date > $today) {
+			//	$msg .= "Prosimy o uregulowanie zaleglosci do dnia {$due_date} r.";
+			} else {
+			}
+			$ret['Powiadomienie SMS o zaleglosciach'] = array('label'=>"Windykacja: Powiadomienie SMS o zaleglosciach", 'msg'=>$msg);
+		}
+		return $ret;
+	}
+
 	/**
 	 * Update user phone status.
 	 * 
@@ -3243,7 +3322,7 @@ class WindykacjaStatsHelper {
 	 * @param $phone_status - phone status
 	 * 
 	 */
-	public static function update_phone_status(&$user, $phone_status) {
+	public static function update_phone_status($user, $phone_status) {
 		$data_arr = array();
 
 		$data_arr["A_RECORD_UPDATE_DATE"] = date("Y-m-d-H:i");
@@ -3279,6 +3358,66 @@ class WindykacjaStatsHelper {
 		return true;
 	}
 
+	public static function update_sms_status($user, $sms_status) {
+		$data_arr = array();
+		$status_info = self::get_sms_status_info($user);
+		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">$sms_status ';print_r($sms_status);echo'</pre>';
+		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">$status_info ';print_r($status_info);echo'</pre>';
+
+		if (!array_key_exists($sms_status, $status_info)) {
+			echo '<div class="alert alert-danger">Nieznany status!</div>';
+			return false;
+		}
+		$db_webone = DB::getDB('931');
+		if (!$db_webone) {
+			echo '<div class="alert alert-danger">Brak połączenia do bazy billing!</div>';
+			return false;
+		}
+		$sqlArr = array();
+		$sqlArr["`ID_BILLING_USERS`"] = $user->ID;
+		$sqlArr["`SUBJECT`"] = "'{$status_info[$sms_status]['label']}'";
+		$sqlArr["`BODY_HTML`"] = "'{$status_info[$sms_status]['msg']}'";
+		$sqlArr["`REQUEST_STATUS_SMS`"] = "'SENT_SMS'";
+		$sql = "insert into `HIST_CONTACTS` (" . implode(",", array_keys($sqlArr)) . ")
+																 values (" . implode(",", array_values($sqlArr)) . ");";
+		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">sql ';print_r($sql);echo'</pre>';
+		$db_webone->query($sql);
+		$smsId = $db_webone->insert_id();
+		echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">$smsId ';print_r($smsId);echo'</pre>';
+
+		$data_arr["A_RECORD_UPDATE_DATE"] = date("Y-m-d-H:i");
+		$data_arr["A_RECORD_UPDATE_AUTHOR"] = $_SESSION['ADM_ACCOUNT'];
+		$data_arr["LAST_SMS_MSG_ID"] = $smsId;
+		$data_arr["LAST_SMS_STATUS"] = $sms_status;
+		$data_arr["LAST_PHONE_STATUS_DATE"] = date("Y-m-d");
+		if (array_key_exists($sms_status, $status_info)) {
+			$date = V::get('date', '', $status_info[$sms_status]);
+			if ($date != '' && $date != '0000-00-00') {
+				$data_arr["PAY_TERM"] = $date;
+			}
+		}
+
+		$sql_arr = array();
+		foreach ($data_arr as $k => $v) {
+			$sql_arr[] = "`{$k}`='{$v}'";
+		}
+		$sql = "update `USERS2_WINDYKACJA_STATUS` set " . implode(",", $sql_arr) . " where `ID`='{$user->WINDYKACJA_ID}' limit 1 ; ";
+		//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">';print_r($sql);echo'</pre>';
+		DB::query($sql);
+
+		// update HIST
+		//if (DB::affected()) {
+			$sql_arr = array();
+			foreach ($data_arr as $k => $v) {
+				$sql_arr["`{$k}`"] = "'{$v}'";
+			}
+			$sql_arr["`ID_USERS2`"] = "'{$user->WINDYKACJA_ID}'";
+			$sql = "insert into `USERS2_WINDYKACJA_STATUS_HIST`(" . implode(",", array_keys($sql_arr)) . ") values(" . implode(",", array_values($sql_arr)) . ");";
+			DB::query($sql);
+		//}
+		return true;
+	}
+
 	public static function update_old_id_koresp(&$user, $id_koresp, $koresp_type) {
 		$db = DB::getDB();
 		$koresp = DB::get_by_id('IN7_DZIENNIK_KORESP', $id_koresp);
@@ -3640,7 +3779,7 @@ class WindykacjaStatsHelper {
 		$sql = "select wh.*
 			from `USERS2_WINDYKACJA_STATUS_HIST` as wh
 			where wh.`ID_USERS2`='{$user->WINDYKACJA_ID}'
-				and wh.`LAST_PHONE_STATUS`!='N/S;'
+				and wh.`LAST_PHONE_STATUS_DATE`!='N/S;'
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {