summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/admin/addressbook/addr.php2
-rw-r--r--www/admin/images/CONTACT.png (renamed from www/admin/pics/CONTACT.png)bin1597 -> 1597 bytes
-rw-r--r--www/admin/images/EVENT.png (renamed from www/admin/pics/EVENT.png)bin1486 -> 1486 bytes
-rw-r--r--www/admin/images/MAIL.png (renamed from www/admin/pics/MAIL.png)bin1451 -> 1451 bytes
-rw-r--r--www/admin/images/NOTES.png (renamed from www/admin/pics/NOTES.png)bin1735 -> 1735 bytes
-rw-r--r--www/admin/images/TASKS.png (renamed from www/admin/pics/TASKS.png)bin1995 -> 1995 bytes
-rw-r--r--www/admin/images/alarm.png (renamed from www/admin/pics/alarm.png)bin630 -> 630 bytes
-rw-r--r--www/admin/images/book.pngbin0 -> 4576 bytes
-rw-r--r--www/admin/images/book2.pngbin0 -> 4703 bytes
-rw-r--r--www/admin/images/codefusion.png (renamed from www/admin/pics/codefusion.png)bin18319 -> 18319 bytes
-rw-r--r--www/admin/images/dialog-information.png (renamed from www/admin/pics/dialog-information.png)bin4255 -> 4255 bytes
-rw-r--r--www/admin/images/erfrakon.png (renamed from www/admin/pics/erfrakon.png)bin2951 -> 2951 bytes
-rw-r--r--www/admin/images/f.png (renamed from www/admin/pics/f.png)bin394 -> 394 bytes
-rw-r--r--www/admin/images/intevation_logo.png (renamed from www/admin/pics/intevation_logo.png)bin7182 -> 7182 bytes
-rw-r--r--www/admin/images/kdab.png (renamed from www/admin/pics/kdab.png)bin25519 -> 25519 bytes
-rw-r--r--www/admin/images/kde.png (renamed from www/admin/pics/kde.png)bin18660 -> 18660 bytes
-rw-r--r--www/admin/images/kolab_logo.png (renamed from www/admin/pics/kolab_logo.png)bin4902 -> 4902 bytes
-rw-r--r--www/admin/images/kolabsystems_logo.png (renamed from www/admin/pics/kolabsystems_logo.png)bin12281 -> 12281 bytes
-rw-r--r--www/admin/images/list.pngbin0 -> 2419 bytes
-rw-r--r--www/admin/images/office-address-book.png (renamed from www/admin/pics/office-address-book.png)bin6651 -> 6651 bytes
-rw-r--r--www/admin/images/phone.pngbin0 -> 3656 bytes
-rw-r--r--www/admin/images/preferences-system-network-sharing.png (renamed from www/admin/pics/preferences-system-network-sharing.png)bin4995 -> 4995 bytes
-rw-r--r--www/admin/images/preferences-system.png (renamed from www/admin/pics/preferences-system.png)bin6296 -> 6296 bytes
-rw-r--r--www/admin/images/resource-group.png (renamed from www/admin/pics/resource-group.png)bin5049 -> 5049 bytes
-rw-r--r--www/admin/images/sync.png (renamed from www/admin/pics/sync.png)bin837 -> 837 bytes
-rw-r--r--www/admin/images/system-users.png (renamed from www/admin/pics/system-users.png)bin4641 -> 4641 bytes
-rw-r--r--www/admin/index.php4
-rw-r--r--www/admin/style.css2
-rwxr-xr-x[-rw-r--r--]www/admin/user/activesync.php44
-rw-r--r--www/admin/user/index.php10
-rw-r--r--www/admin/user/user.php3
31 files changed, 40 insertions, 25 deletions
diff --git a/www/admin/addressbook/addr.php b/www/admin/addressbook/addr.php
index 66adeab..6cc0ae4 100644
--- a/www/admin/addressbook/addr.php
+++ b/www/admin/addressbook/addr.php
@@ -175,7 +175,7 @@ if( !$errors ) {
unset( $distlists['count'] );
foreach( $distlists as $distlist ) {
$dlcn = $distlist['mail'][0];
- $errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='" $params['kolab_wui'] . "/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
+ $errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='".$params['kolab_wui']."/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
}
if( !$errors ) {
diff --git a/www/admin/pics/CONTACT.png b/www/admin/images/CONTACT.png
index 916f6ab..916f6ab 100644
--- a/www/admin/pics/CONTACT.png
+++ b/www/admin/images/CONTACT.png
Binary files differ
diff --git a/www/admin/pics/EVENT.png b/www/admin/images/EVENT.png
index 2e02fc9..2e02fc9 100644
--- a/www/admin/pics/EVENT.png
+++ b/www/admin/images/EVENT.png
Binary files differ
diff --git a/www/admin/pics/MAIL.png b/www/admin/images/MAIL.png
index bc77592..bc77592 100644
--- a/www/admin/pics/MAIL.png
+++ b/www/admin/images/MAIL.png
Binary files differ
diff --git a/www/admin/pics/NOTES.png b/www/admin/images/NOTES.png
index 7dca846..7dca846 100644
--- a/www/admin/pics/NOTES.png
+++ b/www/admin/images/NOTES.png
Binary files differ
diff --git a/www/admin/pics/TASKS.png b/www/admin/images/TASKS.png
index d3d600d..d3d600d 100644
--- a/www/admin/pics/TASKS.png
+++ b/www/admin/images/TASKS.png
Binary files differ
diff --git a/www/admin/pics/alarm.png b/www/admin/images/alarm.png
index 0703e7a..0703e7a 100644
--- a/www/admin/pics/alarm.png
+++ b/www/admin/images/alarm.png
Binary files differ
diff --git a/www/admin/images/book.png b/www/admin/images/book.png
new file mode 100644
index 0000000..8a35c34
--- /dev/null
+++ b/www/admin/images/book.png
Binary files differ
diff --git a/www/admin/images/book2.png b/www/admin/images/book2.png
new file mode 100644
index 0000000..ac460f5
--- /dev/null
+++ b/www/admin/images/book2.png
Binary files differ
diff --git a/www/admin/pics/codefusion.png b/www/admin/images/codefusion.png
index be04ff1..be04ff1 100644
--- a/www/admin/pics/codefusion.png
+++ b/www/admin/images/codefusion.png
Binary files differ
diff --git a/www/admin/pics/dialog-information.png b/www/admin/images/dialog-information.png
index c65f616..c65f616 100644
--- a/www/admin/pics/dialog-information.png
+++ b/www/admin/images/dialog-information.png
Binary files differ
diff --git a/www/admin/pics/erfrakon.png b/www/admin/images/erfrakon.png
index 3b2d5d6..3b2d5d6 100644
--- a/www/admin/pics/erfrakon.png
+++ b/www/admin/images/erfrakon.png
Binary files differ
diff --git a/www/admin/pics/f.png b/www/admin/images/f.png
index 7572bac..7572bac 100644
--- a/www/admin/pics/f.png
+++ b/www/admin/images/f.png
Binary files differ
diff --git a/www/admin/pics/intevation_logo.png b/www/admin/images/intevation_logo.png
index deb54e4..deb54e4 100644
--- a/www/admin/pics/intevation_logo.png
+++ b/www/admin/images/intevation_logo.png
Binary files differ
diff --git a/www/admin/pics/kdab.png b/www/admin/images/kdab.png
index 66af0ed..66af0ed 100644
--- a/www/admin/pics/kdab.png
+++ b/www/admin/images/kdab.png
Binary files differ
diff --git a/www/admin/pics/kde.png b/www/admin/images/kde.png
index 3efaaf8..3efaaf8 100644
--- a/www/admin/pics/kde.png
+++ b/www/admin/images/kde.png
Binary files differ
diff --git a/www/admin/pics/kolab_logo.png b/www/admin/images/kolab_logo.png
index 27b7d12..27b7d12 100644
--- a/www/admin/pics/kolab_logo.png
+++ b/www/admin/images/kolab_logo.png
Binary files differ
diff --git a/www/admin/pics/kolabsystems_logo.png b/www/admin/images/kolabsystems_logo.png
index 90620d3..90620d3 100644
--- a/www/admin/pics/kolabsystems_logo.png
+++ b/www/admin/images/kolabsystems_logo.png
Binary files differ
diff --git a/www/admin/images/list.png b/www/admin/images/list.png
new file mode 100644
index 0000000..2936528
--- /dev/null
+++ b/www/admin/images/list.png
Binary files differ
diff --git a/www/admin/pics/office-address-book.png b/www/admin/images/office-address-book.png
index 3b00f62..3b00f62 100644
--- a/www/admin/pics/office-address-book.png
+++ b/www/admin/images/office-address-book.png
Binary files differ
diff --git a/www/admin/images/phone.png b/www/admin/images/phone.png
new file mode 100644
index 0000000..8f81416
--- /dev/null
+++ b/www/admin/images/phone.png
Binary files differ
diff --git a/www/admin/pics/preferences-system-network-sharing.png b/www/admin/images/preferences-system-network-sharing.png
index b6faf42..b6faf42 100644
--- a/www/admin/pics/preferences-system-network-sharing.png
+++ b/www/admin/images/preferences-system-network-sharing.png
Binary files differ
diff --git a/www/admin/pics/preferences-system.png b/www/admin/images/preferences-system.png
index 9ea5cec..9ea5cec 100644
--- a/www/admin/pics/preferences-system.png
+++ b/www/admin/images/preferences-system.png
Binary files differ
diff --git a/www/admin/pics/resource-group.png b/www/admin/images/resource-group.png
index 84cfa89..84cfa89 100644
--- a/www/admin/pics/resource-group.png
+++ b/www/admin/images/resource-group.png
Binary files differ
diff --git a/www/admin/pics/sync.png b/www/admin/images/sync.png
index 389f036..389f036 100644
--- a/www/admin/pics/sync.png
+++ b/www/admin/images/sync.png
Binary files differ
diff --git a/www/admin/pics/system-users.png b/www/admin/images/system-users.png
index e2bd558..e2bd558 100644
--- a/www/admin/pics/system-users.png
+++ b/www/admin/images/system-users.png
Binary files differ
diff --git a/www/admin/index.php b/www/admin/index.php
index d4e5d9a..6611264 100644
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -70,6 +70,10 @@ $smarty->assign( 'group', $auth->group() );
$smarty->assign( 'page_title', 'Kolab' );
$smarty->assign( 'menuitems', $menuitems );
$smarty->assign( 'submenuitems', array() );
+
+//assign values fo different welcome pages, based on menu.php settings
+$smarty->assign( 'dmurl',$menuitems['domain-maintainer']['url']);
+$smarty->assign( 'murl',$menuitems['maintainer']['url']);
$smarty->assign( 'maincontent', $maincontent );
$smarty->display('page.tpl');
diff --git a/www/admin/style.css b/www/admin/style.css
index 5e69dd2..1edcb40 100644
--- a/www/admin/style.css
+++ b/www/admin/style.css
@@ -31,7 +31,7 @@ a:hover { color: #113399; }
}
#toplogo {
display:block;
- background-image: url(pics/kolab_logo.png);
+ background-image: url(images/kolab_logo.png);
background-color: #B0BCD0;
width: 245px;
height: 70px;
diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index 081a15a..24aea3e 100644..100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -27,30 +27,30 @@ require_once('KolabAdmin/include/authenticate.php');
require_once('KolabAdmin/include/form.class.php');
require_once('KolabAdmin/include/passwd.php');
+//try to include ALL possible configuration files
+@include_once '/kolab/var/kolab/www/z-push/config.php';
+@include_once '/etc/z-push/config.php';
+@include_once '/usr/share/z-push/config.php';
+@include_once '/var/www/z-push/config.php';
-///kolab/etc/kolab/templates/zpush-config.php.template which is then copied to /kolab/var/kolab/www/z-push/zpush.config
+//define errors array
+$errors = array();
if((@include_once 'Horde/Kolab/Kolab_Zpush/lib/kolabActivesyncData.php') === false ) {
//z-Push in not installed. Why don't you show some scarry warining?
$errors[] =_('zPush in not enabled in your system.');
}
-@include_once '/kolab/var/kolab/www/z-push/config.php';
-@include_once '/etc/z-push/config.php';
-@include_once '/usr/share/z-push/config.php';
-@include_once '/var/www/z-push/config.php';
-/*read from here value of the KOLAB_LAXPIC
+/*read from her value of the KOLAB_LAXPIC
-1 = allow the user to select (or if the constant doesn't exist)
0 = same as the annotations (no lax mode just jpeg)
1 = force the lax mode for all
*/
-
if(!defined('KOLAB_LAXPIC')){define('KOLAB_LAXPIC',-1);}
-//define errors array
-$errors = array();
+
//delete device
if(isset($_POST['deid']))
@@ -215,16 +215,22 @@ function __construct()
//remove Inbox/ part from the name
$folder_chunk=explode("/",$folder);
- //if if only inbox/ show it
- if($folder_chunk[1]!=""){
+ //if it's only inbox/ show it
+
+
+ if($folder_chunk[1]!="" and count($folder_chunk)==2 and $folder_chunk[0]=="INBOX"){
//else is inbox/somepart - show only somepart
$folder=$folder_chunk[1];
- }if($folder_chunk[2]!="")
+ }if($folder_chunk[2]!="" and count($folder_chunk)==3 and $folder_chunk[0]=="user")
{
//user folder
- $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
- }
+ $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
+ }else
+ {
+ $folder= preg_replace(array('/INBOX\//'),array(''),$folder);
+
+ }
//for saving annot
$part_folder[]=$folders[$i]['realname'];
@@ -437,7 +443,7 @@ function is_default($folder)
/**** Authentication etc. ***/
-$sidx = 'user';
+$sidx = 'activesync';
require_once('KolabAdmin/include/menu.php');
/**** Submenu for current page ***/
@@ -446,16 +452,22 @@ $menuitems[$sidx]['selected'] = 'selected';
//ActiveSync part
+if(count($errors) <1)
+{
$d= new ActiveSyncManager;
$devs= $d->getdevices();
$folds=$d->getfolders();
$ola=true;
+
if(count($devs)<1)
{
$errors[] =_("There are currently no devices known for your user.<br/><br/>In order to register a device, please connect it to the server first, using <a href='http://wiki.kolab.org/Z_push#Clients'>the instructions in the Wiki</a>. Afterwards the device should become available for configuration in this dialogue.");
$ola = false;
}
+}
+
+
/**** Insert into template and output ***/
$smarty = new MySmarty();
@@ -514,4 +526,4 @@ $smarty->display('page-ajax.tpl');
End:
vim:encoding=utf-8:
*/
-?>
+?> \ No newline at end of file
diff --git a/www/admin/user/index.php b/www/admin/user/index.php
index 51675ed..1f0b2aa 100644
--- a/www/admin/user/index.php
+++ b/www/admin/user/index.php
@@ -53,10 +53,8 @@ if( !$errors ) {
if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
else $base_dn = 'k=kolab';
- $privmembers = array_merge( (array)$ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
- (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
-
- $userfilter = "cn=*";
+
+ $userfilter = "uid=*";
$filterattr = KolabForm::getRequestVar('filterattr');
$filtertype = KolabForm::getRequestVar('filtertype');
$filtervalue = KolabForm::getRequestVar('filtervalue');
@@ -157,7 +155,7 @@ if( !$errors ) {
}
// skip admins and maintainers
- if( !array_key_exists( $dn, $privmembers ) ) {
+
$entries[] = array( 'dn' => $dn,
'sn' => $sn,
'fn' => $fn,
@@ -165,7 +163,7 @@ if( !$errors ) {
'mail' => $mail,
'uid' => $uid,
'deleted' => $deleted );
- }
+
$entry = ldap_next_entry( $ldap->connection,$entry );
}
}
diff --git a/www/admin/user/user.php b/www/admin/user/user.php
index 215e792..9ee1a6a 100644
--- a/www/admin/user/user.php
+++ b/www/admin/user/user.php
@@ -510,7 +510,8 @@ $entries['street_0'] = array( 'name' => _('Street Address') );
$entries['postOfficeBox_0'] = array( 'name' => _('Postbox') );
$entries['postalCode_0'] = array( 'name' => _('Postal Code') );
$entries['l_0'] = array( 'name' => _('City') );
-$entries['c_0'] = array( 'name' => _('Country') );
+$entries['c_0'] = array( 'name' => _('Country'),
+ 'comment' => _('2 letter code from <a href="http://www.iso.org/iso/english_country_names_and_code_elements" target="_blank">ISO 3166</a>') );
$entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number'),
'validation' => 'checkphone' );
$entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number'),