[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7121] Merge 7112:7120 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7121] Merge 7112:7120 from trunk |
|
Date: |
Tue, 15 Mar 2011 08:53:24 +0000 |
Revision: 7121
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7121
Author: sigurdne
Date: 2011-03-15 08:53:24 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
Merge 7112:7120 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.sogroup.inc.php
branches/Version-1_0-branch/booking/inc/class.soorganization.inc.php
branches/Version-1_0-branch/booking/inc/class.uigroup.inc.php
branches/Version-1_0-branch/booking/inc/class.uiorganization.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/setup/setup.inc.php
branches/Version-1_0-branch/booking/setup/tables_current.inc.php
branches/Version-1_0-branch/booking/setup/tables_update.inc.php
branches/Version-1_0-branch/booking/templates/base/group_edit.xsl
branches/Version-1_0-branch/booking/templates/base/organization_edit.xsl
branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
branches/Version-1_0-branch/filemanager/inc/class.bofilemanager.inc.php
branches/Version-1_0-branch/filemanager/setup/phpgw_en.lang
branches/Version-1_0-branch/filemanager/setup/setup.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
branches/Version-1_0-branch/setup/accounts.php
Added Paths:
-----------
branches/Version-1_0-branch/filemanager/inc/class.menu.inc.php
Removed Paths:
-------------
branches/Version-1_0-branch/filemanager/inc/hook_admin.inc.php
branches/Version-1_0-branch/filemanager/inc/hook_preferences.inc.php
branches/Version-1_0-branch/filemanager/inc/hook_sidebox_menu.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120
Modified: branches/Version-1_0-branch/booking/inc/class.sogroup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.sogroup.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/inc/class.sogroup.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -10,6 +10,7 @@
array(
'id' => array('type'
=> 'int'),
'active' => array('type'
=> 'int', 'required' => true),
+ 'show_in_portal' =>
array('type' => 'int', 'required'=>true),
'organization_id' => array('type'
=> 'int', 'required' => true),
'shortname' => array('type'
=> 'string', 'required' => False, 'query' => True),
'description' => array('type' =>
'string', 'query' => true, 'required' => false,),
Modified: branches/Version-1_0-branch/booking/inc/class.soorganization.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.soorganization.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/inc/class.soorganization.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -21,7 +21,8 @@
'zip_code' => array('type'
=> 'string'),
'district' => array('type'
=> 'string'),
'city' => array('type'
=> 'string'),
- 'active' =>
array('type' => 'int', 'required'=>true),
+ 'active' => array('type'
=> 'int', 'required'=>true),
+ 'show_in_portal' =>
array('type' => 'int', 'required'=>true),
'activity_id' => array('type' =>
'int', 'required' => true),
'customer_identifier_type'
=> array('type' => 'string', 'required' => False),
'customer_number'
=> array('type' => 'string', 'required' => False),
Modified: branches/Version-1_0-branch/booking/inc/class.uigroup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uigroup.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/inc/class.uigroup.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -238,7 +238,7 @@
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $group = array_merge($group,
extract_values($_POST, array('name', 'shortname', 'organization_id',
'organization_name', 'description', 'contacts', 'active', 'activity_id')));
+ $group = array_merge($group,
extract_values($_POST, array('name', 'shortname', 'organization_id',
'organization_name', 'description', 'contacts', 'active', 'activity_id',
'show_in_portal')));
if (!isset($group["active"]))
{
$group['active'] = '1';
Modified: branches/Version-1_0-branch/booking/inc/class.uiorganization.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uiorganization.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/inc/class.uiorganization.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -33,7 +33,7 @@
'street',
'zip_code', 'city', 'district',
'description', 'contacts', 'active',
'organization_number', 'activity_id',
-
'customer_number', 'customer_internal');
+
'customer_number', 'customer_internal', 'show_in_portal');
}
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-03-15
08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-03-15
08:53:24 UTC (rev 7121)
@@ -487,3 +487,4 @@
Can not create a booking in the past booking no Du kan ikke opprette en
booking i fortiden.
Allocations with existing allocations or bookings (%1) booking no
Tildeinger med eksisterende tildelinger eller bookinger (%1)
Contact information name is to long. max 50 characters booking no Navn i
kontakt informasjon er for langt. Maks 50 tegn
+Show in portal booking no Vis i portal
Modified: branches/Version-1_0-branch/booking/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/setup.inc.php 2011-03-15
08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/setup/setup.inc.php 2011-03-15
08:53:24 UTC (rev 7121)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.04';
+ $setup_info['booking']['version'] = '0.2.05';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -87,6 +87,7 @@
'customer_ssn' => array('type' => 'varchar',
'precision' => '12', 'nullable' => True),
'customer_internal' => array('type' => 'int',
'nullable' => False, 'precision' => '4', 'default' => 1),
'shortname' => array('type' =>
'varchar','precision' => '11', 'nullable' => True),
+ 'show_in_portal' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
),
'pk' => array('id'),
'fk' => array(
@@ -121,6 +122,7 @@
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'shortname' => array('type' =>
'varchar','precision' => '11', 'nullable' => True),
+ 'show_in_portal' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
),
'pk' => array('id'),
'fk' => array(
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -2455,4 +2455,27 @@
}
}
+ $test[] = '0.2.04';
+ /**
+ * Update booking version from 0.2.02 to 0.2.03
+ * Add custom fields to request
+ *
+ */
+ function booking_upgrade0_2_04()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_organization ADD COLUMN show_in_portal int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE
bb_organization SET show_in_portal = 0");
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_group ADD COLUMN show_in_portal int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE bb_group
SET show_in_portal = 0");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.05';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/booking/templates/base/group_edit.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/group_edit.xsl
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/templates/base/group_edit.xsl
2011-03-15 08:53:24 UTC (rev 7121)
@@ -77,6 +77,23 @@
</select>
</dd>
</xsl:if>
+ <dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
+ <dd>
+ <select id="field_show_in_portal"
name="show_in_portal">
+ <option value="0">
+ <xsl:if test="group/show_in_portal=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ <option value="1">
+ <xsl:if test="group/show_in_portal=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ </select>
+ </dd>
</dl>
<div style='clear:left; padding:0; margin:0'/>
Modified:
branches/Version-1_0-branch/booking/templates/base/organization_edit.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/organization_edit.xsl
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/booking/templates/base/organization_edit.xsl
2011-03-15 08:53:24 UTC (rev 7121)
@@ -169,6 +169,23 @@
</select>
</dd>
</xsl:if>
+ <dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
+ <dd>
+ <select id="field_show_in_portal"
name="show_in_portal">
+ <option value="0">
+ <xsl:if test="organization/show_in_portal=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ <option value="1">
+ <xsl:if test="organization/show_in_portal=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ </select>
+ </dd>
</dl>
<div style='clear:left; padding:0; margin:0'/>
Modified: branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00', '0.2.01','0.2.02','0.2.03')
+ 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified:
branches/Version-1_0-branch/filemanager/inc/class.bofilemanager.inc.php
===================================================================
--- branches/Version-1_0-branch/filemanager/inc/class.bofilemanager.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/filemanager/inc/class.bofilemanager.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -327,13 +327,15 @@
$this->access_add = true;
}
- if ( $GLOBALS['phpgw']->accounts->data['quota'] == -1 )
+ $account =
$GLOBALS['phpgw']->accounts->get($this->userinfo['account_id']);
+
+ if ( $account->quota == -1 )
{
$this->quota = -1;
}
else
{
- $this->quota =
$GLOBALS['phpgw']->accounts->data['quota'] * 1024 * 1024;
+ $this->quota = $account->quota * 1024 * 1024;
}
}
@@ -1262,11 +1264,11 @@
return $size;
}
- function check_quota($file)
+ function check_quota($file,$size = 0)
{
$size_homedir = $this->get_size($this->homedir, True);
- $size_file = $this->get_size(array('directory' =>
$this->path, 'name' => $file),False);
-
+ $size_file = $size ? (int)$size :
$this->get_size(array('directory' => $this->path, 'name' => $file),False);
+_debug_Array($this->quota);
if($this->quota == -1)
{
return true;
Copied: branches/Version-1_0-branch/filemanager/inc/class.menu.inc.php (from
rev 7120, trunk/filemanager/inc/class.menu.inc.php)
===================================================================
--- branches/Version-1_0-branch/filemanager/inc/class.menu.inc.php
(rev 0)
+++ branches/Version-1_0-branch/filemanager/inc/class.menu.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -0,0 +1,148 @@
+<?php
+ /**
+ * phpGroupWare - filemanager
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2011 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package filemanager
+ * @subpackage core
+ * @version $Id$
+ */
+
+ /**
+ * Description
+ * @package filemanager
+ */
+
+ class filemanager_menu
+ {
+ var $sub;
+
+ var $public_functions = array
+ (
+ 'links' => true,
+ );
+
+ function filemanager_menu($sub='')
+ {
+ $this->sub = $sub;
+ }
+
+ /**
+ * Get the menus for the filemanager
+ *
+ * @return array available menus for the current user
+ */
+ public function get_menu()
+ {
+ $incoming_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
'filemanager';
+
+
+ $menus['navbar'] = array
+ (
+ 'filemanager' => array
+ (
+ 'text' => lang('filemanager'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
"filemanager.uifilemanager.index") ),
+ 'image' => array('filemanager',
'navbar'),
+ 'order' => 35,
+ 'group' => 'uifilemanager'
+ ),
+ );
+
+ $menus['toolbar'] = array();
+
+ if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
+ || $GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'filemanager'))
+ {
+ $menus['admin'] = array
+ (
+ 'site_configuration' => array
+ (
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('site configuration', array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.admin') ),
+ ),
+ 'edit_user_menu_actions' => array
+ (
+ 'text' => lang('edit user menu
actions'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.edit_actions') )
+ )
+ );
+ }
+
+ if (
isset($GLOBALS['phpgw_info']['user']['apps']['preferences']) )
+ {
+ $menus['preferences'] = array
+ (
+ array
+ (
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('Preferences', array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'filemanager.uifilemanager.preferences') )
+ )
+ );
+
+ $menus['toolbar'][] = array
+ (
+ 'text' =>
$GLOBALS['phpgw']->translation->translate('Preferences', array(), true),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'filemanager.uifilemanager.preferences') ),
+ 'image' => array('filemanager',
'preferences')
+ );
+ }
+/*
+ $menus['navigation'] = array
+ (
+ 'filemanager' => array
+ (
+ 'text' => lang('filemanager'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
"filemanager.uifilemanager.index") ),
+ )
+ );
+*/
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
$incoming_app;
+ return $menus;
+ }
+
+ function links()
+ {
+
if(!isset($GLOBALS['phpgw_info']['user']['preferences']['filemanager']['horisontal_menus'])
||
$GLOBALS['phpgw_info']['user']['preferences']['filemanager']['horisontal_menus']
== 'no')
+ {
+ return;
+ }
+ $GLOBALS['phpgw']->xslttpl->add_file(array('menu'));
+ $menu_brutto = execMethod('filemanager.menu.get_menu');
+ $selection =
explode('::',$GLOBALS['phpgw_info']['flags']['menu_selection']);
+ $level=0;
+ $menu['navigation'] =
$this->get_sub_menu($menu_brutto['navigation'],$selection,$level);
+ return $menu;
+ }
+
+ function get_sub_menu($children = array(),
$selection=array(),$level='')
+ {
+ $level++;
+ $i=0;
+ foreach($children as $key => $vals)
+ {
+ $menu[] = $vals;
+ if($key == $selection[$level])
+ {
+ $menu[$i]['this'] = true;
+ if(isset($menu[$i]['children']))
+ {
+ $menu[$i]['children'] =
$this->get_sub_menu($menu[$i]['children'],$selection,$level);
+ }
+ }
+ else
+ {
+ if(isset($menu[$i]['children']))
+ {
+ unset($menu[$i]['children']);
+ }
+ }
+ $i++;
+ }
+ return $menu;
+ }
+ }
Deleted: branches/Version-1_0-branch/filemanager/inc/hook_admin.inc.php
===================================================================
--- branches/Version-1_0-branch/filemanager/inc/hook_admin.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/filemanager/inc/hook_admin.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -1,21 +0,0 @@
-<?php
- /***
- * Filemanager admin hook
- * @author Bettina Gille <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package filemanager
- * @version $Id$
- */
-
- {
-// Only Modify the $file and $title variables.....
- $file = array
- (
- 'site configuration' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.admin') ),
- 'edit user menu actions' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.edit_actions') )
- );
-// Do not modify below this line
- $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
- }
-?>
Deleted: branches/Version-1_0-branch/filemanager/inc/hook_preferences.inc.php
===================================================================
--- branches/Version-1_0-branch/filemanager/inc/hook_preferences.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/filemanager/inc/hook_preferences.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -1,17 +0,0 @@
-<?php
- /***
- * Filemanager preferencest hook
- * @author Bettina Gille <address@hidden>
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package filemanager
- * @version $Id$
- */
-
- {
- $file = array('Preferences' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'filemanager.uifilemanager.preferences')));
- //'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'preferences.uiaclprefs.index', 'acl_app' => $appname)));
- //Do not modify below this line
- display_section($appname,$file);
- }
-?>
Deleted: branches/Version-1_0-branch/filemanager/inc/hook_sidebox_menu.inc.php
===================================================================
--- branches/Version-1_0-branch/filemanager/inc/hook_sidebox_menu.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/filemanager/inc/hook_sidebox_menu.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -1,28 +0,0 @@
-<?php
- /**
- * Filemanager - Sidebox-Menu for iDots Template
- *
- * This hookfile is for generating an app-specific side menu used in the
idots template set.
- * $menu_title speaks for itself
- * $file is the array with link to app functions
- * display_sidebox can be called as much as you like
- * @author Bettina Gille address@hidden
- * @author Pim Snel <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @package filemanager
- * @version $Id$
- * @internal $Source$
- */
-
-
- {
- $appname = 'filemanager';
- $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title']
. ' '. lang('Menu');
-
- $file[] = array('text' => 'Preferences',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'filemanager.uifilemanager.preferences')));
-
- display_sidebox($appname,$menu_title,$file);
- }
-?>
Modified: branches/Version-1_0-branch/filemanager/setup/phpgw_en.lang
===================================================================
--- branches/Version-1_0-branch/filemanager/setup/phpgw_en.lang 2011-03-15
08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/filemanager/setup/phpgw_en.lang 2011-03-15
08:53:24 UTC (rev 7121)
@@ -86,7 +86,7 @@
performed by filemanager en Performed by
preview %1 filemanager en Preview %1
preview of %1 filemanager en Preview of %1
-préférences preferences en Préférences
+preferences filemanager en Preferences
refresh filemanager en Refresh
rename filemanager en Rename
renamed %1 to %2 filemanager en Renamed %1 to %2
Modified: branches/Version-1_0-branch/filemanager/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/filemanager/setup/setup.inc.php 2011-03-15
08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/filemanager/setup/setup.inc.php 2011-03-15
08:53:24 UTC (rev 7121)
@@ -25,10 +25,11 @@
'hooks' => array
(
'add_def_pref',
- 'admin',
+// 'admin',
'deleteaccount',
- 'preferences',
- 'sidebox_menu'
+// 'preferences',
+// 'sidebox_menu'
+ 'menu' => 'filemanager.menu.get_menu'
));
/* Dependencies for this app to work */
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.account.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -861,7 +861,8 @@
$vals = explode(',', $config['set_quota']);
foreach ( $vals as $val )
{
- if ( $quota == $val * 1024 ) // compare kb to kb
+ // if ( $quota == $val * 1024 ) // compare kb to kb
+ if ( $quota == $val )
{
return true;
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php 2011-03-15
08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.acl.inc.php 2011-03-15
08:53:24 UTC (rev 7121)
@@ -499,37 +499,37 @@
1 => array
(
'value' =>
$acct_id,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
2 => array
(
'value' =>
$rights,
- 'type' =>
PDO::PARAM_INT
+ 'type' =>
1 //PDO::PARAM_INT
),
3 => array
(
'value' =>
$grantor,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
4 => array
(
'value' =>
$mask,
- 'type' =>
PDO::PARAM_INT
+ 'type' =>
1 //PDO::PARAM_INT
),
5 => array
(
'value' =>
$loc_id,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
6 => array
(
'value' => $now,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
7 => array
(
'value' =>
$mod_account,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
)
);
}
@@ -565,37 +565,37 @@
1 => array
(
'value' =>
$_acl_account,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
2 => array
(
'value' => $_acl_rights,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
3 => array
(
'value' =>
$_acl_grantor,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
4 => array
(
'value' => $_acl_type,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
5 => array
(
'value' =>
$_location_id,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
6 => array
(
'value' => $now,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
7 => array
(
'value' => $mod_account,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
)
);
}
@@ -684,37 +684,37 @@
1 => array
(
'value' =>
$this->_db->f('acl_account'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
2 => array
(
'value' =>
$this->_db->f('acl_rights'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
3 => array
(
'value' =>
$this->_db->f('acl_grantor'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
4 => array
(
'value' => (int)
$this->_db->f('acl_type'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
5 => array
(
'value' =>
$this->_db->f('location_id'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
6 => array
(
'value' => $now,
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
7 => array
(
'value' => $mod_account,
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
)
);
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -265,7 +265,7 @@
* @param integer $num_rows number of rows to return (optional),
if unset will use
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
* @return integer current query id if sucesful and null if fails
*/
- public function limit_query($Query_String, $offset = -1, $line
= '', $file = '', $num_rows = -1)
+ public function limit_query($Query_String, $offset, $line = '',
$file = '', $num_rows = 0)
{
if ( (int) $num_rows <= 0 )
{
@@ -607,7 +607,7 @@
* @param boolean $upper optional, default False. If $upper is
true, then the table names (array keys) are upper-cased.
* @return array Table meta data
*/
- public function MetaForeignKeys($table = '', $owner=false,
$upper=false)
+ public function MetaForeignKeys($table, $owner=false,
$upper=false)
{
if(!$this->adodb->IsConnected())
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php 2011-03-15
08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php 2011-03-15
08:53:24 UTC (rev 7121)
@@ -70,7 +70,7 @@
if ( !isset($GLOBALS['phpgw_info']['server']['temp_dir'])
||
!is_dir($GLOBALS['phpgw_info']['server']['temp_dir']) )
{
- if ( substr(PHP_OS, 3) == 'WIN' )
+ if ( substr(PHP_OS,0, 3) == 'WIN' )
{
$GLOBALS['phpgw_info']['server']['temp_dir'] =
'c:/temp';
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
2011-03-15 08:50:40 UTC (rev 7120)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_shared.inc.php
2011-03-15 08:53:24 UTC (rev 7121)
@@ -585,7 +585,7 @@
'nofiles' => True
)
);
-
+
if ($ls_array[0]['mime_type'])
{
$mime_type = $ls_array[0]['mime_type'];
@@ -595,7 +595,10 @@
$mime_type = 'text/plain';
}
- header('Content-type: ' . $mime_type);
+// header('Content-type: ' . $mime_type);
+ $browser = CreateObject('phpgwapi.browser');
+
$browser->content_header($ls_array[0]['name'],$mime_type,$ls_array[0]['size']);
+
echo $this->read (array (
'string' => $data['string'],
'relatives' => $data['relatives']
Modified: branches/Version-1_0-branch/setup/accounts.php
===================================================================
--- branches/Version-1_0-branch/setup/accounts.php 2011-03-15 08:50:40 UTC
(rev 7120)
+++ branches/Version-1_0-branch/setup/accounts.php 2011-03-15 08:53:24 UTC
(rev 7121)
@@ -129,15 +129,22 @@
phpgw::import_class('phpgwapi.globally_denied');
$errors = array();
- if ( $passwd == '' || $passwd2 == '' )
- {
- $errors[] = lang('Password can not be empty');
- }
-
if ( $passwd != $passwd2 )
{
$errors[] = lang('Passwords did not match, please
re-enter');
}
+ else
+ {
+ $account = new phpgwapi_user();
+ try
+ {
+ $account->validate_password($passwd);
+ }
+ catch(Exception $e)
+ {
+ $errors[] = $e->getMessage();
+ }
+ }
if ( !$username )
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7121] Merge 7112:7120 from trunk,
Sigurd Nes <=