Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2192

Přidáno uživatelem Ondřej Fibich před asi 11 roky(ů)

Upravy:
- vylepseni formulare pro pridani clena (podobne jako u registrace je predcisli i telefon. cislo v jednom radku)

Opravy:
- closes #769: Opravit chyby baliku zjistene lintianem, obsahuje * vse presunuto z /var/www do /usr/share * prepracovanou praci s cronem * opraveny a doplneny changelog * copywriting, changelog * zpresneni zavislosti

Zobrazit rozdíly:

freenetis/branches/1.1/application/controllers/members.php
// phone prefixes
$country_model = new Country_Model();
$phone_prefixes = $country_model->select_country_list();
$phone_prefixes = $country_model->select_country_code_list();
// form
$form = new Forge();
......
$form->group('Contact information');
$form->dropdown('phone_prefix')
->label('Telephone prefix')
->label('Phone')
->rules('required')
->options($phone_prefixes)
->selected(Settings::get('default_country'))
->style('width:200px');
->class('join1')
->style('width:70px');
$form->input('phone')
->rules('required|length[9,40]')
->callback(array($this, 'valid_phone'));
->callback(array($this, 'valid_phone'))
->class('join2')
->style('width:180px');
$form->input('email')
->rules('length[3,50]|valid_email');
->rules('required|length[3,100]|valid_email')
->style('width:250px');
if (Settings::get('finance_enabled'))
{
freenetis/branches/1.1/application/controllers/registration.php
->rules('required')
->options($phone_prefixes)
->selected(Settings::get('default_country'))
->class('join1');
->class('join1')
->style('width:70px');
$form->input('phone')
->rules('required|length[9,40]')
->callback(array($this, 'valid_phone'))
->class('join2');
->class('join2')
->style('width:180px');
$form->input('email')
->rules('required|length[3,100]|valid_email')
->callback(array($this, 'valid_email'))
->style('width:300px');
->style('width:250px');
$form->group('Additional information');
freenetis/branches/1.1/application/vendors/deb/freenetis/freenetis.cron
# /etc/cron.d/freenetis: Regular CRON file for freenetis package (triggered each minute)
SHELL=/bin/sh
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
freenetis/branches/1.1/application/vendors/deb/freenetis/changelog
freenetis (1.0.0~beta1) unstable; urgency=low
* First official beta release
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 26 Jun 2012 21:28:47 +0200
freenetis (1.0.7) stable; urgency=hight
* Fix release (#416, #436, #445, #452)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Wed, 16 Jan 2013 19:09:56 +0100
freenetis (1.0.0~beta2) unstable; urgency=low
* Second official beta release - all functionality included in this release
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 31 Jul 2012 12:54:59 +0200
freenetis (1.0.6) stable; urgency=hight
* Fix release (#358, #443)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 03 Jan 2013 17:41:28 +0100
freenetis (1.0.0~beta5) unstable; urgency=low
* Added new mechanism for database upgrades and version system (#146)
* Several bug fixes
-- Ondrej Fibich <ondrej.fibich@gmail.com> Wed, 01 Aug 2012 17:05:25 +0200
freenetis (1.0.5) stable; urgency=hight
* Fix release (#254, #294, #396, #399, #402, #409, #410)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Wed, 31 Oct 2012 00:35:25 +0100
freenetis (1.0.0~beta6) unstable; urgency=low
* Improvements in DEB package
* Improvements in installation
freenetis (1.0.4) stable; urgency=hight
* Fix release (#366, #367, #373, #374, #376, #377, #378, #380, #383, #384)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 27 Sep 2012 21:24:48 +0200
freenetis (1.0.3) stable; urgency=hight
* Fix release (#363, #355, #358, #362, #361)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 18 Sep 2012 19:33:24 +0200
freenetis (1.0.2) stable; urgency=hight
* Fix release (#336, #334, #331, #329, #325, #324, #321, #320, #297)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Sat, 15 Sep 2012 09:01:17 +0200
freenetis (1.0.1) stable; urgency=hight
* Fix release (#296, #298, #299, #305, #309, #310)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 28 Aug 2012 09:28:44 +0200
freenetis (1.0.0) stable; urgency=hight
* Official release 1.0.0
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 23 Aug 2012 10:37:46 +0200
freenetis (1.0.0~rc13) unstable; urgency=low
* Restrict local installation (#289)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 21 Aug 2012 08:37:46 +0200
freenetis (1.0.0~rc7) unstable; urgency=low
* Changes in interface of ifaces
* Several bug fixes
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 02 Aug 2012 16:02:42 +0200
* Fixes dependencies
-- Ondrej Fibich <ondrej.fibich@gmail.com> Mon, 13 Aug 2012 11:19:41 +0200
freenetis (1.0.0~rc6) unstable; urgency=low
* Added support for redirection and server aliases in apache config (#246)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Mon, 06 Aug 2012 15:49:56 +0200
freenetis (1.0.0~rc1) unstable; urgency=low
* First official RC release
-- Ondrej Fibich <ondrej.fibich@gmail.com> Fri, 03 Aug 2012 16:43:44 +0200
freenetis (1.0.0~beta7) unstable; urgency=low
* Support for monitoring package
* Device templates import/export functionality
* Several bug fixes
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 02 Aug 2012 16:02:42 +0200
freenetis (1.0.0~rc1) unstable; urgency=low
* First official RC release
-- Ondrej Fibich <ondrej.fibich@gmail.com> Fri, 03 Aug 2012 16:43:44 +0200
freenetis (1.0.0~beta6) unstable; urgency=low
* Improvements in DEB package
* Improvements in installation
* Several bug fixes
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 02 Aug 2012 16:02:42 +0200
freenetis (1.0.0~rc6) unstable; urgency=low
* Added support for redirection and server aliases in apache config (#246)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Mon, 06 Aug 2012 15:49:56 +0200
freenetis (1.0.0~rc7) unstable; urgency=low
* Changes in interface of ifaces
freenetis (1.0.0~beta5) unstable; urgency=low
* Added new mechanism for database upgrades and version system (#146)
* Several bug fixes
* Fixes dependencies
-- Ondrej Fibich <ondrej.fibich@gmail.com> Mon, 13 Aug 2012 11:19:41 +0200
-- Ondrej Fibich <ondrej.fibich@gmail.com> Wed, 01 Aug 2012 17:05:25 +0200
freenetis (1.0.0~rc13) unstable; urgency=low
* Restrict local installation (#289)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 21 Aug 2012 08:37:46 +0200
freenetis (1.0.0~beta2) unstable; urgency=low
* Second official beta release - all functionality included in this release
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 31 Jul 2012 12:54:59 +0200
freenetis (1.0.0) stable; hight
* Official release 1.0.0
-- Ondrej Fibich <ondrej.fibich@gmail.com> Thu, 23 Aug 2012 10:37:46 +0200
freenetis (1.0.1) stable; hight
* Fix release (#296, #298, #299, #305, #309, #310)
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 28 Aug 2012 09:28:44 +0200
freenetis (1.0.0~beta1) unstable; urgency=low
* First official beta release
-- Ondrej Fibich <ondrej.fibich@gmail.com> Tue, 26 Jun 2012 21:28:47 +0200
freenetis/branches/1.1/application/vendors/deb/freenetis/control
Priority: optional
Section: web
Pre-Depends: debconf (>= 0.5) | debconf-2.0
Depends: coreutils, wget, grep, apache2, php5, php5-curl, libapache2-mod-php5, php5-mysql | php5-mysqli, mysql-client, php5-mcrypt, php5-gd, php5-snmp
Depends: coreutils (>= 6.10-6), wget (>= 1.11-4.1), grep (>= 2.5.3), apache2, php5, php5-curl, libapache2-mod-php5, php5-mysql | php5-mysqli, mysql-client, php5-mcrypt, php5-gd, php5-snmp
Suggests: mysql-server (>= 5.0.0), mysql-client
Architecture: all
Maintainer: Ondrej Fibich <ondrej.fibich@gmail.com>
Homepage: http://www.freenetis.org
Description: FreenetIS - information system for managing non-profit networks
FreenetIS is multilingual information system for managing non-profit networks
which is capable to manage:
- users and their groups;
- double-entry accounting system (payments, double-entry transfers, bank transfers, accounts, bank accounts, cash flow);
- network infrastructure (devices, segments, interfaces, IP addresses, subnets, VLANs, VLAN interfaces, bridges, ports);
- network management (device monitoring, DHCP servers configuration, traffic statistics, QoS);
- notifications of users (traffic redirection, e-mail messages, SMS messages);
- work reporting of active users and work approval;
- lists of calls and billing of VoIP;
- etc.
Description-cs.UTF-8: FreenetIS - informační systém pro počítačové sítě, provozované neziskovou organizací
FreenetIS je vícejazyčný informační systém pro počítačové sítě, provozované neziskovou organizací, který je schopen spravovat:
- uživatele a jejich skupiny;
- podvojné účty organizace (platby, podvojné převody, bankovní převody, bankovní účty, cash flow);
- síťová infrastruktura (zařízení, segmenty, rozhraní, IP adresy, podsítě, VLANy, VLAN rozhraní, bridge, porty);
- správa sítě (monitorování zařízení, konfigurace DHCP serverů, statistiky provozu, QoS);
- upozorňování uživatelů (přesměrování provozu, e-mailové zprávy, SMS zprávy);
- práce aktivních uživatelů a jejich schvalování;
- výpisy volání a placení VoIP po napojení na ústřednu;
- etc.
Description: Information system for managing non-profit networks
FreenetIS is multilingual information system for managing non-profit networks.
.
It is capable to manage:
- users and their groups;
- double-entry accounting system (payments, double-entry transfers,
bank transfers, accounts, bank accounts, cash flow);
- network infrastructure (devices, segments, interfaces, IP addresses,
subnets, VLANs, VLAN interfaces, bridges, ports);
- network management (device monitoring, DHCP servers configuration,
traffic statistics, QoS);
- notifications of users (traffic redirection, e-mail messages, SMS messages);
- work reporting of active users and work approval;
- lists of calls and billing of VoIP;
- etc.
Description-cs.UTF-8: Informační systém pro počítačové sítě, provozované neziskovou organizací
FreenetIS je vícejazyčný informační systém pro počítačové sítě, provozované
neziskovou organizací.
.
Je schopen spravovat:
- uživatele a jejich skupiny;
- podvojné účty organizace (platby, podvojné převody, bankovní převody,
bankovní účty, cash flow);
- síťová infrastruktura (zařízení, segmenty, rozhraní, IP adresy, podsítě,
VLANy, VLAN rozhraní, bridge, porty);
- správa sítě (monitorování zařízení, konfigurace DHCP serverů,
statistiky provozu, QoS);
- upozorňování uživatelů (přesměrování provozu, e-mailové zprávy, SMS zprávy);
- práce aktivních uživatelů a jejich schvalování;
- výpisy volání a placení VoIP po napojení na ústřednu;
- atd.
freenetis/branches/1.1/application/vendors/deb/freenetis/debianization.sh
mkdir deb_packages/tmp
cd deb_packages/tmp
mkdir DEBIAN
mkdir var
mkdir var/www
mkdir var/www/${NAME}
mkdir etc
mkdir etc/freenetis
mkdir etc/freenetis/https
mkdir etc/cron.d
mkdir -m 755 DEBIAN
mkdir -m 755 usr
mkdir -m 755 usr/share
mkdir -m 755 usr/share/${NAME}
mkdir -m 755 usr/share/doc
mkdir -m 755 usr/share/doc/${NAME}
mkdir -m 755 etc
mkdir -m 755 etc/freenetis
mkdir -m 755 etc/freenetis/https
# copy content of package ######################################################
......
exit 2
fi
cd tmp/var/www/${NAME}
cd tmp/usr/share/${NAME}
tar -xvf /tmp/${NAME}_packaging.tar.gz 1>/dev/null
......
cd ../../../
# remove dev parts of FN
rm -rf var/www/${NAME}/application/vendors/deb
rm -rf var/www/${NAME}/application/vendors/unit_tester
rm -rf var/www/${NAME}/application/vendors/redirection
rm -rf var/www/${NAME}/application/vendors/monitoring
rm -rf var/www/${NAME}/application/vendors/qos
rm -rf var/www/${NAME}/application/vendors/ssh-keys
rm -rf var/www/${NAME}/application/vendors/dhcp
rm -rf var/www/${NAME}/application/vendors/axo_doc
rm -rf var/www/${NAME}/application/controllers/unit_tester.php
rm -rf var/www/${NAME}/application/views/unit_tester
rm -rf usr/share/${NAME}/application/vendors/deb
rm -rf usr/share/${NAME}/application/vendors/unit_tester
rm -rf usr/share/${NAME}/application/vendors/redirection
rm -rf usr/share/${NAME}/application/vendors/monitoring
rm -rf usr/share/${NAME}/application/vendors/qos
rm -rf usr/share/${NAME}/application/vendors/ssh-keys
rm -rf usr/share/${NAME}/application/vendors/dhcp
rm -rf usr/share/${NAME}/application/vendors/axo_doc
rm -rf usr/share/${NAME}/application/controllers/unit_tester.php
rm -rf usr/share/${NAME}/application/views/unit_tester
rm -rf usr/share/${NAME}/application/vendors/phpwhois/testsuite.php
# remove hidden
rm -rf var/www/${NAME}/.htaccess
rm -rf var/www/${NAME}/config.php
rm -rf var/www/${NAME}/upload/*
rm -rf var/www/${NAME}/logs
rm -rf var/www/${NAME}/doc
rm -rf var/www/${NAME}/tests
rm -rf usr/share/${NAME}/.htaccess
rm -rf usr/share/${NAME}/config.php
rm -rf usr/share/${NAME}/upload/*
rm -rf usr/share/${NAME}/logs
rm -rf usr/share/${NAME}/doc
rm -rf usr/share/${NAME}/tests
# remove .svn
rm -rf `find var/www/${NAME} -type d -name .svn`
rm -rf `find usr/share/${NAME} -type d -name .svn`
# change permissions
find usr/share/${NAME} -type d -exec chmod 0755 {} \;
find usr/share/${NAME} -type f -exec chmod 0644 {} \;
find usr/share/${NAME} -type f -name *.pl -exec chmod +x {} \;
# copy config file
cp ../../freenetis/freenetis.conf etc/freenetis/
chmod 0644 etc/freenetis/freenetis.conf
# copy cron file
cp ../../freenetis/freenetis.cron etc/cron.d/freenetis
# doc ##########################################################################
# change log
cat ../../${NAME}/changelog >> usr/share/doc/${NAME}/changelog
# debian change log is same
cp usr/share/doc/${NAME}/changelog usr/share/doc/${NAME}/changelog.Debian
# copyright
echo "This package was debianized by Ondrej Fibich <ondrej.fibich@gmail.com> on `date -R`" >> usr/share/doc/${NAME}/copyright
echo "It was downloaded from <http://freenetis.org/>\n" >> usr/share/doc/${NAME}/copyright
echo "Copyright:" >> usr/share/doc/${NAME}/copyright
cat ../../../../../AUTHORS >> usr/share/doc/${NAME}/copyright
echo "\nLicense:" >> usr/share/doc/${NAME}/copyright
cat ../../../../../COPYING >> usr/share/doc/${NAME}/copyright
echo "\nOn Debian systems, the complete text of the GNU General" >> usr/share/doc/${NAME}/copyright
echo "Public License can be found in \`/usr/share/common-licenses/GPL-3'.\n" >> usr/share/doc/${NAME}/copyright
echo -n "The Debian packaging is (C) `date +%Y`, Ondrej Fibich <ondrej.fibich@gmail.com> and" >> usr/share/doc/${NAME}/copyright
echo " it is licensed under the GPL, see above.\n" >> usr/share/doc/${NAME}/copyright
# rights
chmod 644 usr/share/doc/${NAME}/changelog usr/share/doc/${NAME}/changelog.Debian \
usr/share/doc/${NAME}/copyright
# compress doc
gzip --best usr/share/doc/${NAME}/changelog
gzip --best usr/share/doc/${NAME}/changelog.Debian
# count size
SIZE=`du -s var | cut -f1`
SIZE=`du -s usr | cut -f1`
# calculate checksum ###########################################################
......
echo "Installed-Size: ${SIZE}" >> DEBIAN/control
cat ../../${NAME}/control >> DEBIAN/control
# change log
cat ../../${NAME}/changelog >> DEBIAN/changelog
# copywriting
echo "This package was debianized by Ondrej Fibich <ondrej.fibich@gmail.com> on" >> DEBIAN/copyright
date -R >> DEBIAN/copyright
echo "" >> DEBIAN/copyright
echo "It was downloaded from <http://freenetis.org/>" >> DEBIAN/copyright
echo "" >> DEBIAN/copyright
echo "Upstream Author:" >> DEBIAN/copyright
cat var/www/${NAME}/AUTHORS >> DEBIAN/copyright
echo "" >> DEBIAN/copyright
echo "License:" >> DEBIAN/copyright
cat var/www/${NAME}/COPYING >> DEBIAN/copyright
# scripts ######################################################################
cp -a -f ../../${NAME}/preinst DEBIAN/preinst
cp -a -f ../../${NAME}/postinst DEBIAN/postinst
cp -a -f ../../${NAME}/prerm DEBIAN/prerm
cp -a -f ../../${NAME}/postrm DEBIAN/postrm
cp -a -f ../../${NAME}/templates DEBIAN/templates
cp -a -f ../../${NAME}/config DEBIAN/config
cp -a -f ../../${NAME}/conffiles DEBIAN/conffiles
chmod +x DEBIAN/preinst DEBIAN/postinst DEBIAN/postrm DEBIAN/config
chmod 755 DEBIAN/preinst DEBIAN/postinst DEBIAN/prerm DEBIAN/postrm DEBIAN/config
chmod 0644 DEBIAN/templates DEBIAN/conffiles DEBIAN/md5sums
# create deb ###################################################################
......
cd ..
sudo chown -hR root:root *
cd tmp
sudo chmod ugo+w var/www/${NAME}
sudo chmod ugo+w var/www/${NAME}/upload
sudo mkdir -m 0777 var/www/${NAME}/logs
sudo chmod g-w etc/cron.d/freenetis
# make package
cd ..
freenetis/branches/1.1/application/vendors/deb/freenetis/postinst
SERVER=apache2
CONFIGFILE=/etc/freenetis/freenetis.conf
CONFIG_SAMPLE_PHP=/var/www/freenetis/config-sample.php
CONFIG_SAMPLE_PHP=/usr/share/freenetis/config-sample.php
# Generate config file, if it doesn’t exist.
# An alternative is to copy in a template
......
# Make post install things
# 0) Access rights to some directories
chmod ugo+w /usr/share/freenetis
chmod ugo+w /usr/share/freenetis/upload
mkdir -m 0777 /usr/share/freenetis/logs 2>/dev/null || true
# 1) Apache config
echo "Preparing Apache"
......
php_flag file_uploads On
php_flag short_open_tag On
# large inputs (fixes #358, #410)
php_value max_input_vars 100000
php_value max_input_vars 100000
php_admin_value suhosin.post.max_vars 100000
php_admin_value suhosin.request.max_vars 100000"
php_admin_value suhosin.request.max_vars 100000"
# make config for FN
if [ "$SERVER_TYPE" = localhost ]; then
echo "<Directory /var/www/freenetis>" > $A2CF
echo "Alias /freenetis /usr/share/freenetis" > $A2CF
echo "<Directory /usr/share/freenetis>" >> $A2CF
echo " Options Indexes FollowSymLinks MultiViews" >> $A2CF
echo " AllowOverride All" >> $A2CF
echo " Order allow,deny" >> $A2CF
......
echo " ServerName ${SERVERNAME}" >> $A2CF
echo " ServerAlias www.${SERVERNAME}" >> $A2CF
echo " DocumentRoot /var/www/freenetis" >> $A2CF
echo " <Directory /var/www/freenetis>" >> $A2CF
echo " DocumentRoot /usr/share/freenetis" >> $A2CF
echo " <Directory /usr/share/freenetis>" >> $A2CF
echo " Options Indexes FollowSymLinks MultiViews" >> $A2CF
echo " AllowOverride All" >> $A2CF
echo " Order allow,deny" >> $A2CF
......
echo "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /etc/cron.d/freenetis
echo "* * * * * root wget -O /dev/null ${PROTOCOL}://${SERVERNAME}/index.php/cs/scheduler/run --no-check-certificate -q" >> /etc/cron.d/freenetis
chmod g-w /etc/cron.d/freenetis
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d cron restart 3>/dev/null || true
else
......
dpkg-reconfigure locales
fi
fi
#DEBHELPER#
freenetis/branches/1.1/application/vendors/deb/freenetis/postrm
#!/bin/sh
# FreenetIS DEB: actions before uninstalling of package
# FreenetIS DEB: actions after uninstalling of package
set -e
......
# remove config files
rm -rf $CONFIGFILE
# remove all files
rm -rf /var/www/freenetis
rm -rf /usr/share/freenetis
# remove dir if empty
[ "$(ls -A /etc/freenetis)" ] || rm -rf /etc/freenetis
# restart apache
freenetis/branches/1.1/application/vendors/deb/freenetis/preinst
else
/etc/init.d/apache2 stop 3>/dev/null || true
fi
#DEBHELPER#
freenetis/branches/1.1/application/vendors/deb/freenetis/prerm
#!/bin/sh
# FreenetIS DEB: actions before uninstalling of package
set -e
# remove CRON entry
rm -rf /etc/cron.d/freenetis
# restart CRON
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d cron restart 3>/dev/null || true
else
/etc/init.d/cron restart 3>/dev/null || true
fi
freenetis/branches/1.1/application/vendors/deb/freenetis/templates
Template: freenetis/https_add_redir
Type: boolean
Default: false
Description: Automatically redirect from HTTP to HTTPS:
Generates redirection from HTTP version of FreenetIS to HTTPS version.
Description-cs.UTF-8: Automaticky přesměrovávej z HTTP na HTTPS:
Generuje přesměrování z HTTP verze .FreenetISu na HTTPS verzi.
Description: Automatically redirect from HTTP to HTTPS?
Description-cs.UTF-8: Automaticky přesměrovávat z HTTP na HTTPS?
Template: freenetis/hack_reload
Type: boolean
Default: true
Description: Hack:
Hack for propper working of loading package.
Description: Hack for propper working of loading package?

Také k dispozici: Unified diff