Merge resolve conflicts on lxcenter:master #3

Merged
merged 733 commits into from Feb 11, 2012

Projects

None yet

2 participants

@shakaran

No description provided.

mustafaramadhan and others added some commits Aug 13, 2011
mustafaramadhan Issue #638 - Installation fails if 'admin' group already exists 1737fad
mustafaramadhan Issue #547, #565, #578, #583, #593, #599, #607, #609, #623, #638, #57…
…7, #612, #563, #566, #567, #575, #589, #590, #597, #598 - (sorry, difficult to description one-by-one) (final)
42dca59
dterweij Rollback r563-r569 (breaks trunk and branch (if merge to branch)). Co…
…mmits replaced new code (6.2.0) with old code (6.1.x). Back at r562. Issues #645 #646 #612 #632 #583 #638 #547 #565 #578 #583 #593 #599 #607 #609 #623 #638 #577 #612 #563 #566 #567 #575 #589 #590 #597 #598
b0bf371
mustafaramadhan Issue #578 - Spamassasin config created in / directory f775554
mustafaramadhan Issue #612 - Hide password in reboot / shutdown server 454a1b7
mustafaramadhan Issue #638 - Installation fails if 'admin' group already exists 697f045
mustafaramadhan Issue #632 - Add some scripts for mysql and apache 46ea7e2
mustafaramadhan Issue #598 - Change lighhtpd config structure 9ca0994
mustafaramadhan Issue #589 (also #563, #566, #567, #571, #575, #590) - Change httpd c…
…onfig structure
4f52724
mustafaramadhan Issue #645 - New installer script (also packer and patcher) for Kloxo…
… 6.1.7
ece5255
mustafaramadhan Issue #646 - New webpage for default/disable/cp/webmail page on Kloxo…
… 6.1.7
96c6427
mustafaramadhan Bug #583: new install not create horde and roundcube database (relate…
…d to r574)
29e0063
mustafaramadhan Bug #637 - Webmail sending problem and possibility solution (change t…
…o smtp for horde default setting)
4f44682
mustafaramadhan Issue #566, #567, #571 - more options for 'PHP type' (ruid2, itk, wor…
…ker and event)
55f9770
mustafaramadhan Issue #651 - Use updatelib.php 6.2.x on 6.1.7 (especially related to …
…new structure of apache and lighttpd)
b4d518f
dterweij Disable install_xcache() and setFreshClam() functions. setFreshClam f…
…reezing the whole process. Some small cleanups. Still need to check everything. Note that xcache is broken now until a better sollution or original code is used again.
8efc079
dterweij Enabled xcache function with better checks (Thanx to René and Mustafa…
…). Cleanups, and other small modifications.
7386876
mustafaramadhan Issue #651, #646, #538 - optimize for setDefaultPages(), user-logo, u…
…ser-skeleton, IMAP problem in 64bit and 'webserver config'
8a9b0f0
mustafaramadhan Issue #650 - Kloxo not generating custom php.ini in Apache/suphp mode 8476fb5
mustafaramadhan Issue #632 - Add some scripts for mysql and apache - disable initProg…
…ram('admin') because want script running in master and slave
fa57a4e
dterweij Cleanups and use existing function to check for packages. 925c7fc
dterweij Back to r439, merged some small changes from Mustafa and a cleanup. b10c7b5
dterweij Disable call to changeMailSoftlimit(), it freezes the upcp/cleanup sc…
…ript (Same as the setFreshClam() function)
7f434c8
dterweij Enable the new localize for the rest of Kloxo 6.2 code (#397) and rev…
…ert Mustafa code in lxlib to 6.2 code.
ec2bac5
dterweij Prepare for new version #634 97c19b0
dterweij New phpMyAdmin version 3.4.4 #634 7064178
dterweij Prepare for new horde version #616 2657a04
mustafaramadhan Issue #645 - update some issue (os detect, etc) a82e5ef
mustafaramadhan Issue #632 - update some logic 23d611a
mustafaramadhan Issue #632 - update some logic (on pscript) 4480ca1
mustafaramadhan Issue #575, #589, #598 - modified again structure for apache and ligh…
…ttpd (apache conf move from /home/httpd/conf to /home/apache/conf)
d7c26df
mustafaramadhan Issue #646 - modified index.php for add link to lxcenter and kloxo logo 4164064
mustafaramadhan Issue #566, #567 - automatic update webmail config when access to 'ge…
…neral settings', 'remote mail', 'webmail application' and etc
3652054
mustafaramadhan Issue #646 - also related to oldheader.php 7faf41e
mustafaramadhan Issue #575, #589, #598 - modified some files related to 'new structur…
…e' of apache and lighttpd
b4a3d59
mustafaramadhan Issue #575, #589, #598 - modified some files related to 'new structur…
…e' of apache and lighttpd (resolve conflict)
5b05122
mustafaramadhan Issue #575, #589, #598 - modified some files related to 'new structur…
…e' of apache and lighttpd (updatelib.php)
1c59d18
mustafaramadhan Issue #575, #589, #598 - remove related logic to isHyperVm() db83e15
mustafaramadhan Issue #657 - change check from based on dir to reserved word; also po…
…ssibility to 'send welcome message' to more than 1 email contact
bc9ddda
mustafaramadhan Issue #637 - add auth to true for smtp on horde config 3e6415e
mustafaramadhan Issue #657 - correction for double declare of $reserved 5bca6da
mustafaramadhan Issue #575, #589, #598 - coreection for default webmail config logic e4011cf
dterweij Update phpMyAdmin to 3.4.5 (#634) 992b451
dterweij Prepare for phpMyAdmin 3.4.5 (#634) (last change still showed 3.4.4) 40cc601
dterweij Turn back on Help Vars. 2ac8c80
dterweij Add phpMyAdmin 3.4.5 (#634) acda1dd
mustafaramadhan Issue #575, #589, #598 - change to always override ~lxcenter.conf to …
…make sure use latest copy when update (also cleanup)
2798fba
dterweij Issue #580 Move out thirdparty from SVN e8d1a6a
dterweij Prepare RoundCube update (#619) 4dd6812
dterweij issue #397. Fixed the location. It was not included everywhere. 618df6f
mustafaramadhan Issue #575, #589, #598 - correction for couldn't wrote web config rel…
…ated to generalsetting also warning for modified postUpdate()
27ecc5f
mustafaramadhan Issue #630 - parse_ini_file to be enabled by default f1e7e69
mustafaramadhan Issue #575, #589, #598 - change checking from '' to !isset() for webm…
…ail.conf
9274bb4
mustafaramadhan Issue #583 - modified logic for change password and disable double pr…
…ocess in install
241eed9
mustafaramadhan Issue #590 - Move module setting from .httaccess to domain config (re…
…submit)
2332deb
mustafaramadhan Issue #566, #567 - message and desc (resubmit) 65a658e
mustafaramadhan Issue #598: main config (resubmit) 49ed3fa
mustafaramadhan Issue #589, #598 - related to fixwebdnsfullupdate.php (resubmit) e1f079e
mustafaramadhan Issue #628 - checking for exist or not __help and __helpvar 72536f6
mustafaramadhan Issue #645 - enough use kloxo-installer.sh and kloxo kloxo-installer.…
…php (combine lxins.php, install_common.php and installall.php). Possible for install old version when combine with kloxo-packer.sh. And, back/revert old file to old code.
f096bf4
mustafaramadhan Issue #645 - modified kloxo-packer.sh (more interactive). the same wi…
…th latest branches update
d56f62d
mustafaramadhan Issue #563, #566, #567, #571, #575, #575, #589, #590 - related to apa…
…che/lighhtpd new structure and others
b3a40c2
mustafaramadhan Issue #645 - fixed problem for identified for dir with -f to -d (on t…
…runk)
8bfb4da
mustafaramadhan Issue #563, #566, #567, #571, #575, #575, #589, #590 - re-insert isHy…
…perVm logic (on trunk)
ffab641
mustafaramadhan Issue #645 - without yes-no because make confuse 8e61633
mustafaramadhan Issue #589 - enable http://ip/~client on httpd 2.2.20/2.2.21 88b239c
mustafaramadhan Issue #589, #598 - cleanup also call setFreshClam() eaf6e80
mustafaramadhan Issue #671 - Fixed backup-restore issue (and improve) - use tgz inste…
…ad tar for improve to less space and use alternative code for backup/restore function
24c553f
mustafaramadhan Issue #671 - Fixed backup-restore issue (and improve) - fix do_zip_to…
…_fileserv
3c00ef2
mustafaramadhan Issue #589, #598 - disable call setFreshClam() and installInstallApp() 2c7d0df
dterweij Add Hungarian language support (#677) 26bf150
mustafaramadhan Issue #671 - Fixed backup-restore issue (and improve) - improve code 0b2a7e8
dterweij Change doc.lxlabs.com to wiki.lxcenter.org (#669) 1f2d4a9
dterweij Update 'Webserver Config' information dialog text. (Layout and remove…
… difficult information presented to the user)
7a70993
dterweij Add DNS Template information box. 24629d3
dterweij Prepare for #547 (fckeditor to ckeditor) 68a6ad8
mustafaramadhan Issue #645 - fixed/optimize/modified code (on thrunk) 2904522
mustafaramadhan Issue #632 - fixed/optimize/modified code (on thrunk) 9cabebe
mustafaramadhan issue #674 - wildcard and subdomain problem ed60fc0
mustafaramadhan Issue #671 - backup default use tgz but can change to tar with backup…
…_compress_disabled.flg flag
44f9578
mustafaramadhan Issue #565 - no delete but inactive with /* */ ff02cac
mustafaramadhan Issue #652 - modified code related to os detect 5eca15b
mustafaramadhan Issue #680 - change inode from diskspace*500 to 0 (unlimited) 53d5878
mustafaramadhan Issue #646 - index.php include inc.php or custom-inc.php (if exists) ccfd755
mustafaramadhan Issue #652 - also optimize code 19f7601
mustafaramadhan Issue #645 - last modified to new installer add3a12
mustafaramadhan Issue #645 - no need --db-rootpassword because automatic reset mysql …
…root password
e6eb06a
mustafaramadhan Issue #645 - no need --db-rootpassword because automatic reset mysql …
…root password (resubmit)
2143179
mustafaramadhan Issue #646 - change 'information box' width to 100% (consistance widt…
…h for long and short texts)
3d91342
mustafaramadhan Issue #632 - fixed/optimize/modified code 4d10636
mustafaramadhan Issue #589, #598 - add 'version' stamp for guarantee no override when…
… switch webserver or run /script/cleanup
4cd0b42
mustafaramadhan Issue #646 - fixed issue related to cleanup process d938342
dterweij Copy r685 from branch 423bc0f
dterweij Cleanups and make differences between branch and trunk. Enabled fix f…
…or #658.
7150fae
dterweij Add missing $downloadserver declaration. It failed to download kloxo-…
…install.zip.
217483f
mustafaramadhan Issue 645, #566, #567, #589 - use only one declare for $downloadserve…
…r and fixed ruid2 (no needed ruid2.conf from rpm)
cf972a9
dterweij Issue #656 Validate checks added bce5b09
mustafaramadhan Issue #645 - fixed related to if user-logo.png no exists 0e54322
mustafaramadhan Issue 583 - change to hidden error message but force execute (case: h…
…orde error when running cleanup)
b8bcd97
dterweij Revert changes. Could crash lighttpd. #656 391391b
mustafaramadhan and others added some commits Nov 12, 2011
mustafaramadhan Issue #598, #589, #674 - fixed for create .htaccess and add kloxoscri…
…pt dir for fix-chownchmod
80f9696
dterweij Language Fixes. 858b2d2
mustafaramadhan issue #578, #721 - fixed mailpath 52a919d
mustafaramadhan issue #578, #721 - fixed mailpath for bogofilter and spamassassin lik…
…e ezmlm
00238c4
dterweij Prepare for Kloxo 6.1.7 release. 1afd7c1
mustafaramadhan Issue #728 - odified Apache conf structure for handling 'exclusive ip…
…' and ip/~client
a479b39
mustafaramadhan Issue #729 - modified Lighttpd conf structure for handling 'exclusive…
… ip' and ip/~client
dbf0210
mustafaramadhan Issue #728 - also fixed/handling 'disable' client (for website and we…
…bmail)
d22ef0e
mustafaramadhan Issue #729 - fixed for 'disable' client; defaults pages still not wor…
…k when set wildcards
129afd1
mustafaramadhan Issue #728, #729 - make the same dirs structure for apache and lighttpd eecd727
mustafaramadhan Issue #728, #729, #646 - fixed 'no kloxo db connect' on slave; new lo…
…gin page (like defaults pages) (sync from thrunk); add fixmail on update;
bcd6cbc
mustafaramadhan Issue #702 - back to previous code because with modified code become …
…error 'mailaccount_add_failed'
7df892b
dterweij Prepare for Kloxo 6.1.8 fc4783b
dterweij Run cleanup after new versions. 62da9fa
dterweij Prepare for 6.1.9 9f60d0c
mustafaramadhan fixed update logos for login and add info for cleanup 724db3e
mustafaramadhan Issue #730 - Slave auto upgraded / apache config broken 287b774
mustafaramadhan Issue #730 - just remove 'too much' info 8803564
mustafaramadhan Issue #730 - fixed for /etc/php.ini; change log_cleanup text; modifie…
…d text info for 'server alias'
4efba80
mustafaramadhan Issue #730 - disable 'user-skeleton' because not work for domain crea…
…te on slave
38ebe13
mustafaramadhan Issue #730 - escape for "php bug" for 'user-skeleton' where with 'bug…
…' make skeleton.zip always zero-bytes on slave.
580a375
mustafaramadhan Issue #730 - modified message text (thanks andew); fixed path for fixssl 255a2b8
mustafaramadhan Issue #730 - fixed for mysql not running in fresh kloxo slave; set fo…
…r new script without problem on master and slave; create script for on/off clamav
667d854
mustafaramadhan Issue #730 - fixed for mysql not running in fresh kloxo slave (fixed …
…on installing step beside update step)
9dc5170
mustafaramadhan Issue #730 - just remove note because not php bug but something wrong…
… for slave 64bit
3100734
mustafaramadhan Issue #730 - fixed for issue call_with_flag and kloxo.pass on slave; …
…also freshclam logic
a970f80
mustafaramadhan Issue #746 - [WEBMAIL] No login with horde webmail! (appear in 6.1.7) 76c9330
mustafaramadhan Issue #730 - back to original to some fix scripts (thanks com2 for wa…
…rning) but add '--server=all' for all servers
e0f3d94
mustafaramadhan Issue #730 - sync code between branches and trunk 39d8f28
mustafaramadhan Issue #730 - fixed 64bit slave (skeleton.zip always zero) when creati…
…ng domain
6abce69
mustafaramadhan [6.1.10beta] - add '--help' argument also change 'info' for some scri…
…pts (thanks walter); this beta fixed some major issues.
a47c9f0
mustafaramadhan Issue #753 - install old kloxo version only with kloxo-installer.sh -…
…- old version still nothing problem on 64bit!!!
271813f
mustafaramadhan Issue #753 - change info (thanks andrew) with better english. 77673ba
mustafaramadhan [6.1.10beta] - add '--help' argument also for fixdns 76f14fb
mustafaramadhan [6.1.10beta] - fixed some script for wrong info if arguments exist. fd066de
shakaran Security bugfix: Don't use "rand" password on lxpopuser and generate …
…a real random salt password
b45022b
mustafaramadhan issue #725, #760, #762 - set ownership /home/<client> and /home/<clie…
…nt>/<domain> to <client>:apache for suphp and slave issues
c76ce8b
mustafaramadhan [6.1.10beta] - change to fix-chownchmod only appear in 'webserver con…
…fig' on master only
a0befdd
mustafaramadhan issue #725, #760 - change to defaults and webmail config not use port…
… 443 (thanks Rene and Walter); also use is_master instead is_this_master() for disable fix-chownchmod on 'webserver config'
f5c986d
mustafaramadhan issue #725, #760 - back to use port 443 for conf but change ssl.conf …
…to __ssl.conf to guarantee as the fist listing (more simple and better then previous revision); also fixed apache-optimize
6bb7be9
mustafaramadhan [6.1.10beta] - fixed wrong capture argument of fix-userlogo 0b7f0f8
mustafaramadhan issue #725, #760 - little mod and forgot submit lib.php 19b483c
mustafaramadhan issue #39, #725, #760 - make possible remote ftp with full format set…
… like 'ftp://ip:20001'; also fixed in lib.php for apache/lighttpd
336c182
mustafaramadhan Issue #774 - [beta] Forgot password page is corrupted (thanks Marek) b1b4793
dterweij #772 - Add TTL Support TinyDNS (djbdns) 9532013
mustafaramadhan Issue #775 - Files listing on Pure-ftp (set to normal from 20000 to 1…
…0000)
fc485b7
mustafaramadhan Issue #755 - creation of secondary mx entry at the dns template gives…
… error
1b19d9e
mustafaramadhan Issue #773 - Horde failing to send mail in kloxo 6.1.7 - change to di…
…sable if file_exists
057be4d
mustafaramadhan [6.1.10beta6] - correction for pure-ftpd service remove 6e12336
mustafaramadhan [6.1.10beta6] - make sure transfer skeleton.zip to slave at last proc…
…ess (for handle situation where ownership not match); chkconfig off for pure-ftpd also remove it's service script (prevent user running 'service pure-ftpd restart')
5f36d6d
dterweij Do not mess with OS devices. Leave that to the OS default. b1efb6a
dterweij Issue #779. Webmail SSL link linked to non-SSL. 6da4d66
dterweij Prepare for Kloxo 6.1.10 Release. ca7ccb2
dterweij All changes of revision 460 where removed by revision 697 (Why?). Ref…
…actored it again to add the gettext and valid HTML/CSS tags #397. Also updated the po/mo files and added fr_FR.
eeb0cde
dterweij #397 - Add fr to the mainlib b48be9f
dterweij #781 - Update Kloxo always to the latest version instead one by one. 5ded1bd
mustafaramadhan Issue #786 - Add Buffers and Cached Memory Info on Resource List 68a9a50
dterweij #787 - Update IonCube Loaders to 4.0.11 5acf22a
dterweij Fixed a packaging bug. 48dfc18
dterweij #617 - Prepare for AWStats 7.0 f5be36e
dterweij #617 - Add AWStats 7.0 d59bd6f
dterweij #619 - Add Roundcube 0.6 0f296c9
dterweij #616 - Add Horde3 1.2.10 a3821ff
dterweij #574 - Add CKEditor 3.6 2d5e0d8
dterweij Issue #574 Update CKEditor to 3.6.2 a339966
dterweij Issue #574 Update CKEditor to 3.6.2 fc4d66b
dterweij Issue #574 Update CKEditor to 3.6.2 b57181f
dterweij Issue #574 Update CKEditor to 3.6.2 20861b1
dterweij Issue #574 Update CKEditor to 3.6.2 58e50c6
dterweij Issue #574 Update CKEditor to 3.6.2 e616edd
dterweij Issue #574 Update CKEditor to 3.6.2 5f83afc
dterweij Issue #574 Update CKEditor to 3.6.2 7de9a03
dterweij Issue #574 Update CKEditor to 3.6.2 f2666d9
dterweij Issue #574 Update CKEditor to 3.6.2 fc8bb36
dterweij Issue #574 Update CKEditor to 3.6.2 7116d60
dterweij Issue #574 Update CKEditor to 3.6.2 64143bd
dterweij Issue #574 Update CKEditor to 3.6.2 b5fe5e2
dterweij Issue #574 Update CKEditor to 3.6.2 25729e5
dterweij Issue #574 Update CKEditor to 3.6.2 910f8a5
dterweij Issue #574 Update CKEditor to 3.6.2 31df04c
dterweij Issue #574 Update CKEditor to 3.6.2 729a48b
dterweij #574 - Remove old FCKEdtor version if CKEditor exist and use FCKEdito…
…r if CKEdtor is not present (not installed)
da553da
dterweij #574 - Remove FCKEditor 236573d
dterweij #574 - Distribution tools: Change to use CKEditor. e9f075e
mustafaramadhan Bug #797 - Failed identify ip on apache (also trick for behind modem/…
…adsl but official support until nginx release)
0e1f40b
dterweij #799 - Scan icon set dir so it shows up in the dropdown selection list f6ec9ff
mustafaramadhan Bug #797 - call function directly instead mimic e733c35
mustafaramadhan Issue #798 - Check for Core packages (rpm) when running upcp; also ma…
…ke better code for do_zip_to_fileserv
c4cd1df
mustafaramadhan issue #824 - Optimize code for apache/lighttpd to make faster delete/…
…add/update/fix configs; file fixweb/fixweb.php also related to #826
133e3e5
mustafaramadhan Issue #826 - Add '--client' argument for some fix scripts and able to…
… multiple servers or clients; not include fix-chownchmod/userlogo/userskeleton (issue #830)
de71116
mustafaramadhan Issue #826 - resubmit for fixphpini.php because wrong copy-paste cca1952
dterweij Remove old login/index.php file. It is created from file/default_inde…
…x.php (Solves a wrong index page when deploy from Development IDE)
b845fcf
@dterweij dterweij About the Kloxo project 028a709
@shakaran shakaran Simple example for demostrate commit on dev and merge on master after. 7ab54a9
Ángel Guzmán Maeso Merge pull request #2 from shakaran/dev
Simple example for demostrate commit on dev and merge on master after.
6e9750f
@shakaran shakaran Merge dev into master 842dab3
@shakaran shakaran Resolve conflicts on dev f56c80f
@shakaran shakaran merged commit b381f78 into lxcenter:master Feb 11, 2012
@dterweij dterweij added a commit that referenced this pull request Feb 11, 2012
@dterweij dterweij Revert "Merge pull request #3 from shakaran/master"
This reverts commit b381f78, reversing
changes made to d1632f9.
f5447f0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment