[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7969] Merge 7953:7968 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7969] Merge 7953:7968 from trunk |
|
Date: |
Sat, 29 Oct 2011 21:32:07 +0000 |
Revision: 7969
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7969
Author: sigurdne
Date: 2011-10-29 21:32:07 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Merge 7953:7968 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
branches/Version-1_0-branch/booking/templates/base/datatable.xsl
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email.php
branches/Version-1_0-branch/controller/inc/class.menu.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/templates/base/control.xsl
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
branches/Version-1_0-branch/phpgwapi/templates/portico/css/base.css
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
Added Paths:
-----------
branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
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,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952
+
/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,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968
Modified: branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/booking/inc/class.uisystem_message.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -43,7 +43,7 @@
'list' => array(
array(
'id' => '',
- 'name' => lang('Not selected')
+ 'name' => lang('All')
),
array(
'id' => 'NEW',
@@ -61,7 +61,7 @@
'list' => array(
array(
'id' => '',
- 'name' => lang('Not selected')
+ 'name' => lang('All')
),
array(
'id' => 'message',
Modified: branches/Version-1_0-branch/booking/templates/base/datatable.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/datatable.xsl
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/booking/templates/base/datatable.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -115,12 +115,12 @@
<select name="{$name}"
onMouseout="window.status='';return true;">
<xsl:for-each select="list">
<xsl:variable name="id"><xsl:value-of
select="id"/></xsl:variable>
- <xsl:if test="id =
'NEW'">
+ <xsl:if test="id = ''">
<option value="{$id}"
selected="selected">
<xsl:value-of select="name"/>
</option>
</xsl:if>
- <xsl:if test="id !=
'NEW'">
+ <xsl:if test="id != ''">
<option value="{$id}">
<xsl:value-of select="name"/>
</option>
Modified:
branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email.php
===================================================================
--- branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/catch/inc/custom/default/notify_by_email.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -1,134 +1,132 @@
<?php
-
$validator = CreateObject('phpgwapi.EmailAddressValidator');
- if(!isset($config_data['notify_email']) ||
!$config_data['notify_email'])
+ if(isset($config_data['notify_email']) && $config_data['notify_email'])
{
- throw new Exception("notify_accounting_by_email: missing
'notify_email' in config for this catch schema:{$schema_text}");
- }
+ $to_array = array();
+ $_to_array = explode(',', $config_data['notify_email']);
+ if (isset($config_data['notify_rule']) &&
$config_data['notify_rule'])
+ {
+ $notify_rule = explode(',',
$config_data['notify_rule']);
+ foreach($notify_rule as $_rule )
+ {
+ $__rule = explode('=>', $_rule);
+ if($__rule)
+ {
+ $_condition = explode('=', $__rule[0]);
+ if($_condition)
+ {
+ $this->db->query("SELECT * FROM
$target_table WHERE id = {$id} AND " . trim($_condition[0]) . "='" .
trim($_condition[1]) . "'",__LINE__,__FILE__);
+ if($this->db->next_record() &&
isset($_to_array[($__rule[1]-1)]))
+ {
+ $to_array[] =
$_to_array[($__rule[1]-1)];
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ $to_array = $_to_array;
+ }
+//_debug_array($to_array);
- $to_array = explode(',', $config_data['notify_email']);
+ $socommon = CreateObject('property.socommon');
+ $prefs = $socommon->create_preferences('property',$user_id);
-//_debug_array($to_array);
-/*
- foreach($to_array as $_to)
- {
- if( !$validator->check_email_address($_to) )
+ if ($validator->check_email_address($prefs['email']))
{
- throw new Exception("notify_accounting_by_email: an
unvalid 'notify_email': {$_to} in config for schema:{$schema_text}");
+ $account_name =
$GLOBALS['phpgw']->accounts->id2name($user_id);
+ // avoid problems with the delimiter in the send class
+ if(strpos($account_name,','))
+ {
+ $_account_name = explode(',', $account_name);
+ $account_name = ltrim($_account_name[1]) . ' '
. $_account_name[0];
+ }
+ $from_email = "{$account_name}<{$prefs['email']}>";
+
+ $to_array[] = $from_email;
}
- }
-*/
- $socommon = CreateObject('property.socommon');
- $prefs = $socommon->create_preferences('property',$user_id);
-//_debug_array($prefs);
- if ($validator->check_email_address($prefs['email']))
- {
- $account_name = $GLOBALS['phpgw']->accounts->id2name($user_id);
- // avoid problems with the delimiter in the send class
- if(strpos($account_name,','))
+
+ if (!is_object($GLOBALS['phpgw']->send))
{
- $_account_name = explode(',', $account_name);
- $account_name = ltrim($_account_name[1]) . ' ' .
$_account_name[0];
+ $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
}
- $from_email = "{$account_name}<{$prefs['email']}>";
- $to_array[] = $from_email;
- }
+ $_to = implode(';',$to_array);
- if (!is_object($GLOBALS['phpgw']->send))
- {
- $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
- }
+ $from_name = 'noreply';
+ $from_email = isset($from_email) && $from_email ? $from_email :
"{$from_name}<address@hidden>";
+ $cc = '';
+ $bcc ='';
+ $subject = "{$schema_text}::{$id}";
- $_to = implode(';',$to_array);
+ unset($_link_to_item);
- $from_name = 'noreply';
- $from_email = isset($from_email) && $from_email ? $from_email :
"{$from_name}<address@hidden>";
- $cc = '';
- $bcc ='';
- $subject = "{$schema_text}::{$id}";
-
- /*
- $_link_to_item = 'http://'.
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction' =>
'property.uientity.view',
- 'type'
=> 'catch',
- 'entity_id'
=> $entity_id,
- 'cat_id'
=> $cat_id,
- 'id'
=> $id
- ));
- */
- //$body = "<a href='{$_link_to_item}'>{$subject}</a>";
- unset($_link_to_item);
+ if(isset($config_data['email_message']) &&
$config_data['email_message'])
+ {
+ $body = str_replace(array('[', ']'), array('<', '>'),
$config_data['email_message']);
+ }
+ else
+ {
+ $body ="<H2>Det er registrert ny post i
{$schema_text}</H2>";
+ }
- if(isset($config_data['email_message']) &&
$config_data['email_message'])
- {
- $body = str_replace(array('[', ']'), array('<', '>'),
$config_data['email_message']);
- }
- else
- {
- $body ="<H2>Det er registrert ny post i {$schema_text}</H2>";
- }
+ $jasper_id = isset($config_data['jasper_id']) &&
$config_data['jasper_id'] ? $config_data['jasper_id'] : 0;
- $jasper_id = isset($config_data['jasper_id']) &&
$config_data['jasper_id'] ? $config_data['jasper_id'] : 0;
+ $attachments = array();
- $attachments = array();
+ if(!$jasper_id)
+ {
+
$this->receipt['error'][]=array('msg'=>lang('notify_by_email: missing
"jasper_id" in config for catch %1 schema', $schema_text));
+ }
+ else
+ {
+ $jasper_parameters = '';
+ $_parameters = array();
- if(!$jasper_id)
- {
- $this->receipt['error'][]=array('msg'=>lang('notify_by_email:
missing "jasper_id" in config for catch %1 schema', $schema_text));
- }
- else
- {
- $jasper_parameters = '';
- $_parameters = array();
+ $_parameters[] = "ID|{$id}";
+ $jasper_parameters = '"' . implode(';', $_parameters) .
'"';
- $_parameters[] = "ID|{$id}";
- $jasper_parameters = '"' . implode(';', $_parameters) . '"';
+ unset($_parameters);
- unset($_parameters);
+ $output_type = 'PDF';
+ $values_jasper =
execMethod('property.bojasper.read_single', $jasper_id);
+ $report_source =
"{$GLOBALS['phpgw_info']['server']['files_dir']}/property/jasper/{$jasper_id}/{$values_jasper['file_name']}";
+ $jasper_wrapper =
CreateObject('phpgwapi.jasper_wrapper');
- $output_type = 'PDF';
- $values_jasper =
execMethod('property.bojasper.read_single', $jasper_id);
- $report_source =
"{$GLOBALS['phpgw_info']['server']['files_dir']}/property/jasper/{$jasper_id}/{$values_jasper['file_name']}";
- $jasper_wrapper =
CreateObject('phpgwapi.jasper_wrapper');
+ try
+ {
+ $report =
$jasper_wrapper->execute($jasper_parameters, $output_type, $report_source,
true);
+ }
+ catch(Exception $e)
+ {
+ $error = $e->getMessage();
+ echo "<H1>{$error}</H1>";
+ }
- //_debug_array($jasper_parameters);
- //_debug_array($output_type);
- //_debug_array($report_source);die();
+ $jasper_fname =
tempnam($GLOBALS['phpgw_info']['server']['temp_dir'], 'PDF_') . '.pdf';
+ file_put_contents($jasper_fname, $report['content'],
LOCK_EX);
- try
- {
- $report = $jasper_wrapper->execute($jasper_parameters,
$output_type, $report_source, true);
+ $attachments[] = array
+ (
+ 'file' => $jasper_fname,
+ 'name' => $report['filename'],
+ 'type' => $report['mime']
+ );
+
+ if($attachments)
+ {
+ $body .= "</br>Se vedlegg";
+ }
}
- catch(Exception $e)
+
+ if ($_to && $GLOBALS['phpgw']->send->msg('email', $_to,
$subject, stripslashes($body), '', $cc, $bcc, $from_email, $from_name, 'html',
'', $attachments , true))
{
- $error = $e->getMessage();
- echo "<H1>{$error}</H1>";
+ $this->receipt['message'][]=array('msg'=> "email
notification sent to: {$_to}");
}
-
- $jasper_fname =
tempnam($GLOBALS['phpgw_info']['server']['temp_dir'], 'PDF_') . '.pdf';
- file_put_contents($jasper_fname, $report['content'], LOCK_EX);
-
- $attachments[] = array
- (
- 'file' => $jasper_fname,
- 'name' => $report['filename'],
- 'type' => $report['mime']
- );
-
- if($attachments)
+ if( isset($jasper_fname) && is_file($jasper_fname) )
{
- $body .= "</br>Se vedlegg";
+ unlink($jasper_fname);
}
}
-
- if ($GLOBALS['phpgw']->send->msg('email', $_to, $subject,
stripslashes($body), '', $cc, $bcc, $from_email, $from_name, 'html', '',
$attachments , true))
- {
- $this->receipt['message'][]=array('msg'=> "email notification
sent to: {$_to}");
- }
- if( isset($jasper_fname) && is_file($jasper_fname) )
- {
- unlink($jasper_fname);
- }
Modified: branches/Version-1_0-branch/controller/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -45,36 +45,12 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uiprocedure.index') ),
'image' => array('property', 'location_1'),
),
- 'example' => array
+ 'check_list' => array
(
- 'text' => 'example',
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uiexample.index') ),
+ 'text' => lang('Check_list'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicheck_list.index') ),
'image' => array('property', 'location_1'),
- 'children' => array(
- 'edit' => array
-
- (
- 'text'
=> 'example::edit',
- 'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uiexample.edit') ),
- 'image'
=> array('rental', 'x-office-spreadsheet')
- ),
- 'normal_tabs'
=> array
-
- (
- 'text'
=> 'example::normal_tabs',
- 'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uiexample.normal_tabs') ),
- 'image'
=> array('rental', 'x-office-spreadsheet')
- ),
- 'separate_tabs'
=> array
-
- (
- 'text'
=> 'example::separate_tabs',
- 'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uiexample.separate_tabs') ),
- 'image'
=> array('rental', 'x-office-spreadsheet')
- ),
-
- )
- ),
+ ),
);
$menus['folders'] =
phpgwapi_menu::get_categories('bergen');
Copied: branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
(from rev 7968, trunk/controller/inc/class.socheck_list.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,55 @@
+<?php
+phpgw::import_class('controller.socommon');
+
+//include_class('controller', 'control_group_list', 'inc/model/');
+
+class controller_socheck_list extends controller_socommon
+{
+ protected static $so;
+
+ /**
+ * Get a static reference to the storage object associated with this
model object
+ *
+ * @return controller_socontrol_group the storage object
+ */
+ public static function get_instance()
+ {
+ if (self::$so == null) {
+ self::$so = CreateObject('controller.socheck_list');
+ }
+ return self::$so;
+ }
+
+ public function get_check_list(){
+
+ $current_time = time();
+
+ $buffer_in_days = 3600*24*7*5;
+
+ $buffer_time = $current_time - $buffer_in_days;
+
+ $sql = "SELECT p.* FROM controller_control p WHERE
$current_time >= p.start_date AND p.start_date > $buffer_time";
+ $this->db->query($sql);
+
+ while ($this->db->next_record()) {
+ $start_date = date("d.m.Y",
$this->db->f('start_date'));
+
+ $result[] = array(
+ 'title' =>
$this->db->f('title'),
+ 'start_date' =>
$start_date
+ );
+ }
+
+ return $result;
+ }
+
+ function get_query(string $sort_field, boolean $ascending, string
$search_for, string $search_type, array $filters, boolean $return_count){}
+
+ function populate(int $object_id, &$object){}
+
+ function add(&$object){}
+
+ function update($object){}
+
+ function get_id_field_name(){}
+}
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -361,7 +361,7 @@
$tables = "controller_control_group";
$joins = " {$this->left_join} fm_building_part ON
(building_part_id = CAST(fm_building_part.id AS INT))";
$joins .= " {$this->left_join} controller_procedure ON
(controller_control_group.procedure_id = controller_procedure.id)";
- $joins .= " {$this->left_join} controller_control_area ON
(control_area_id = controller_control_area.id)";
+ $joins .= " {$this->left_join} controller_control_area ON
(controller_control_group.control_area_id = controller_control_area.id)";
//$joins .= " {$this->left_join} rental_contract_composite ON
(rental_contract_composite.composite_id = rental_composite.id)";
//$joins .= " {$this->left_join} rental_contract ON
(rental_contract.id = rental_contract_composite.contract_id)";
@@ -371,7 +371,7 @@
}
else
{
- $cols .= "controller_control_group.id, group_name,
controller_control_group.procedure_id, control_area_id, building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title, controller_control_area.title as control_area_name ";
+ $cols .= "controller_control_group.id, group_name,
controller_control_group.procedure_id,
controller_control_group.control_area_id, building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title, controller_control_area.title as control_area_name ";
}
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
Copied: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
(from rev 7968, trunk/controller/inc/class.uicheck_list.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,36 @@
+<?php
+ phpgw::import_class('controller.uicommon');
+ phpgw::import_class('controller.socheck_list');
+
+ class controller_uicheck_list extends controller_uicommon
+ {
+ private $so;
+
+ public $public_functions = array
+ (
+ 'index' => true
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+ $this->so = CreateObject('controller.socheck_list');
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::check_list";
+ }
+
+ public function index()
+ {
+
+ $check_list_array = $this->so->get_check_list();
+
+ $data = array
+ (
+ 'check_list_array' => $check_list_array
+ );
+
+
+ self::render_template_xsl('control_check_lists', $data);
+ }
+
+ public function query(){}
+ }
Modified: branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -480,6 +480,67 @@
);
}
+ public function use_yui_editor($targets)
+ {
+ /*
+
self::add_stylesheet('phpgwapi/js/yahoo/assets/skins/sam/skin.css');
+ self::add_javascript('yahoo', 'yahoo/editor',
'simpleeditor-min.js');
+ */
+ $lang_font_style = lang('Font Style');
+ $lang_lists = lang('Lists');
+ $lang_insert_item = lang('Insert Item');
+ $js = '';
+ foreach ( $targets as $target )
+ {
+ $js .= <<<SCRIPT
+ (function() {
+ var Dom = YAHOO.util.Dom,
+ Event = YAHOO.util.Event;
+
+ var editorConfig = {
+ toolbar:
+ {buttons: [
+ { group: 'textstyle',
label: '{$lang_font_style}',
+ buttons: [
+ { type: 'push',
label: 'Fet CTRL + SHIFT + B', value: 'bold' }
+ ]
+ },
+ { type: 'separator' },
+ { group: 'indentlist',
label: '{$lang_lists}',
+ buttons: [
+ { type: 'push',
label: 'Opprett punktliste', value: 'insertunorderedlist' },
+ { type: 'push',
label: 'Opprett nummerert liste', value: 'insertorderedlist' }
+ ]
+ },
+ { type: 'separator' },
+ { group: 'insertitem',
label: '{$lang_insert_item}',
+ buttons: [
+ { type:
'push', label: 'HTML Lenke CTRL + SHIFT + L', value: 'createlink', disabled:
true },
+ { type:
'push', label: 'Sett inn bilde', value: 'insertimage' }
+ ]
+ }
+ ]
+ },
+ height: '200px',
+ width: '700px',
+ animate: true,
+ dompath: true,
+ handleSubmit: true,
+ };
+
+ var editorWidget = new
YAHOO.widget.Editor('{$target}', editorConfig);
+ editorWidget.render();
+ })();
+
+SCRIPT;
+ }
+
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/editor/assets/skins/sam/editor.css');
+ phpgw::import_class('phpgwapi.yui');
+ phpgwapi_yui::load_widget('editor');
+ $GLOBALS['phpgw']->js->add_event('load', $js);
+ }
+
/**
* Returns formatted version of gab id. The format of the
string returned
* is '[Cadastral unit number] / [Property unit number] /
[Leasehold unit number] / [Section unit number]'.
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -266,11 +266,11 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Procedure');
-
$GLOBALS['phpgw']->richtext->replace_element('purpose');
- //$this->use_yui_editor();
-
$GLOBALS['phpgw']->richtext->replace_element('description');
+
//$GLOBALS['phpgw']->richtext->replace_element('purpose');
+
$this->use_yui_editor(array('purpose','description'));
+
//$GLOBALS['phpgw']->richtext->replace_element('description');
//$GLOBALS['phpgw']->richtext->generate_script(true);
- $GLOBALS['phpgw']->richtext->generate_script();
+
//$GLOBALS['phpgw']->richtext->generate_script();
// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'controller.item', 'controller' );
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-10-29
21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-10-29
21:32:07 UTC (rev 7969)
@@ -226,7 +226,7 @@
t_new_procedure controller no Ny prosedyre
f_new_procedure controller no Legg til
Procedure purpose controller no Formål
-Procedure responsibility controller no Ansvarlig
+Procedure responsibility controller no Ansvar og myndighet
Procedure description controller no Beskrivelse
Procedure reference controller no Referanse
Procedure attachment controller no Vedlegg
@@ -257,5 +257,8 @@
Control_equipment controller no Utstyr
New control controller no Ny kontroll
revisit controller no Revidér
-Procedure revision controller no Revisjon
-Procedure revision date controller no Revisjonsdato
\ No newline at end of file
+Procedure revision controller no Versjon
+Procedure revision date controller no Revisjonsdato
+Font Style controller no Font stil
+Lists controller no Lister
+Insert Item controller no Sett inn
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2011-10-29
21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2011-10-29
21:32:07 UTC (rev 7969)
@@ -40,6 +40,6 @@
'controller_check_item',
'controller_check_list',
'controller_procedure',
- 'controller_control_area'
+ 'controller_control_area',
+ 'controller_control_group_list'
);
-?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-10-29 21:32:07 UTC (rev 7969)
@@ -92,7 +92,7 @@
'procedure_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'revision_no' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'revision_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
- 'control_area_id' => array('type' => 'int',
'presicion' => 4, 'nullable' => True)
+ 'control_area_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
@@ -122,16 +122,16 @@
'ix' => array(),
'uc' => array()
),
- 'controller_control_group_list', array(
- 'fd' => array(
- 'id' => array('type' => 'auto',
'nullable' => false),
- 'control_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
- 'control_group_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => false),
- 'order_nr' => array('type' =>
'varchar', 'precision' => '3', 'nullable' => false)
- ),
+ 'controller_control_group_list' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'nullable' =>
false),
+ 'control_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
+ 'control_group_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
+ 'order_nr' => array('type' => 'varchar',
'precision' => '3', 'nullable' => false)
+ ),
'pk' => array('id'),
'fk' => array(),
'ix' => array(),
'uc' => array()
),
- );
\ No newline at end of file
+ );
Copied: branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
(from rev 7968, trunk/controller/templates/base/check_lists.xsl)
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
(rev 0)
+++ branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,9 @@
+<xsl:template name="check_lists" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content tab_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+
+</div>
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/control.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -110,11 +110,10 @@
<dd>
<select id="repeat_type"
name="repeat_type">
<option value="0">Ikke
angitt</option>
- <option
value="1">Daglig</option>
- <option
value="2">Ukentlig</option>
- <option value="3">Månedlig pr
dato</option>
- <option value="4">Månedlig pr
dag</option>
- <option value="5">Årlig</option>
+ <option value="1">Dag</option>
+ <option value="2">Uke</option>
+ <option value="3">Måned</option>
+ <option value="5">År</option>
</select>
</dd>
<dt>
Copied:
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
(from rev 7968, trunk/controller/templates/base/control_check_list.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,59 @@
+<xsl:template name="control_check_list" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content tab_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
+
+ <ul class="groups">
+ <xsl:for-each select="saved_groups_with_items_array">
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
+
+ <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
+
+ <ul id="list">
+ <xsl:for-each
select="control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <xsl:variable
name="order_tag">
+
<xsl:choose>
+
<xsl:when test="order_nr > 0">
+
<xsl:value-of select="order_nr"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:number/>
+
</xsl:otherwise>
+
</xsl:choose>:<xsl:value-of select="id"/>
+ </xsl:variable>
+
+ <li class="list_item">
+ <span
class="drag">
+ <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
+ </span>
+ <a
class="delete">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control_id"/>
+
<xsl:text>&control_item_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<span>x</span>
+ </a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <div>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
+ <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+ </li>
+ </xsl:for-each>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
(from rev 7968, trunk/controller/templates/base/control_check_lists.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,21 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<xsl:call-template name="yui_booking_i18n"/>
+<div class="identifier-header">
+<h1><xsl:value-of select="php:function('lang', 'Check_lists')" /></h1>
+</div>
+
+<div class="yui-content">
+ <div id="details">
+
+ <ul class="check_list">
+ <xsl:for-each select="check_list_array">
+ <li>
+ <span>Tittel:<xsl:value-of
select="title"/></span><span>Start dato:<xsl:value-of
select="start_date"/></span>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ </div>
+ </div>
+</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
(from rev 7968, trunk/controller/templates/base/controller_check_lists.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,16 @@
+<xsl:template name="heck_lists" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content tab_content">
+
+ <!-- =========================== SHOWS CHECK LIST
=============================== -->
+<h3>dsfdsfdsfdsfdsfds</h3>
+ <ul class="check_list">
+ <xsl:for-each select="check_list_array">
+ <li>
+
+ <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
+ </li>
+ </xsl:for-each>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -67,6 +67,7 @@
<xsl:choose>
<xsl:when test="editable">
<select
id="control_area" name="control_area">
+ <option
value="0">Ingen valgt</option>
<xsl:apply-templates select="control_area/options"/>
</select>
</xsl:when>
Copied:
branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl (from
rev 7968, trunk/controller/templates/base/sort_check_list.xsl)
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
(rev 0)
+++ branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,59 @@
+<xsl:template name="sort_check_list" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content tab_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
+
+ <ul class="groups">
+ <xsl:for-each select="saved_groups_with_items_array">
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
+
+ <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
+
+ <ul id="list">
+ <xsl:for-each
select="control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <xsl:variable
name="order_tag">
+
<xsl:choose>
+
<xsl:when test="order_nr > 0">
+
<xsl:value-of select="order_nr"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:number/>
+
</xsl:otherwise>
+
</xsl:choose>:<xsl:value-of select="id"/>
+ </xsl:variable>
+
+ <li class="list_item">
+ <span
class="drag">
+ <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
+ </span>
+ <a
class="delete">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control_id"/>
+
<xsl:text>&control_item_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<span>x</span>
+ </a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <div>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
+ <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+ </li>
+ </xsl:for-each>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl (from
rev 7968, trunk/controller/templates/base/view_check_list.xsl)
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
(rev 0)
+++ branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
2011-10-29 21:32:07 UTC (rev 7969)
@@ -0,0 +1,59 @@
+<xsl:template name="view_check_list" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content tab_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
+
+ <ul class="groups">
+ <xsl:for-each select="saved_groups_with_items_array">
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
+
+ <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
+
+ <ul id="list">
+ <xsl:for-each
select="control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <xsl:variable
name="order_tag">
+
<xsl:choose>
+
<xsl:when test="order_nr > 0">
+
<xsl:value-of select="order_nr"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:number/>
+
</xsl:otherwise>
+
</xsl:choose>:<xsl:value-of select="id"/>
+ </xsl:variable>
+
+ <li class="list_item">
+ <span
class="drag">
+ <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
+ </span>
+ <a
class="delete">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="//control_id"/>
+
<xsl:text>&control_item_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<span>x</span>
+ </a>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <div>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
+ <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+ </li>
+ </xsl:for-each>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/templates/portico/css/base.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/portico/css/base.css
2011-10-29 21:29:13 UTC (rev 7968)
+++ branches/Version-1_0-branch/phpgwapi/templates/portico/css/base.css
2011-10-29 21:32:07 UTC (rev 7969)
@@ -388,3 +388,15 @@
{
padding-left: 20px;
}
+
+.yui-skin-sam .yui-navset .yui-nav li.disabled
+{
+ opacity: .5;
+}
+
+.yui-skin-sam .yui-navset .yui-nav li.disabled a, .yui-skin-sam .yui-navset
.yui-nav li.disabled a:hover
+{
+ background:#D8D8D8 url(sprite.png) repeat-x scroll 0% 50%;
+ cursor: default;
+}
+
Modified:
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
===================================================================
---
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
2011-10-29 21:29:13 UTC (rev 7968)
+++
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
2011-10-29 21:32:07 UTC (rev 7969)
@@ -24,7 +24,7 @@
# * Download: http://www.freetds.org/software.html
# */
FREETDSTAR="freetds-stable.tgz"
-FREETDS="freetds-0.82"
+FREETDS="freetds-0.91"
# Download: http://xmlsoft.org/downloads.html
LIBXMLTAR="libxml2-2.7.8.tar.gz"
@@ -34,8 +34,8 @@
LIBXSL="libxslt-1.1.26"
# Download: ftp://ftp.cac.washington.edu/imap/
-IMAPTAR="imap-2007e.tar.Z"
-IMAP="imap-2007e"
+IMAPTAR="imap-2007f.tar.Z"
+IMAP="imap-2007f"
PHP_PREFIX="/usr/local"
@@ -45,8 +45,8 @@
# * @var string APACHE, APACHETAR
# * Download: http://php.net/
# */
-APACHETAR="httpd-2.2.17.tar.gz"
-APACHE="httpd-2.2.17"
+APACHETAR="httpd-2.2.21.tar.gz"
+APACHE="httpd-2.2.21"
#/**
# * Name of the PHP tarball e.g php-5.2.tar.gz
@@ -54,8 +54,8 @@
# * @var string PHP, PHPTAR
# * Download: http://httpd.apache.org/
# */
-PHPTAR="php-5.3.7.tar.bz2"
-PHP="php-5.3.7"
+PHPTAR="php-5.3.8.tar.bz2"
+PHP="php-5.3.8"
#/**
# * Name of the EACCELERATOR tarball e.g eaccelerator-0.9.5.tar.bz2
@@ -77,9 +77,13 @@
# * Download:
http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
# */
-ORACLETAR="instantclient-basic-linux32-11.2.0.1.zip"
+#ORACLETAR="instantclient-basic-linux32-11.2.0.1.zip"
+#ORACLE="instantclient_11_2"
+#ORACLEDEVELTAR="instantclient-sdk-linux32-11.2.0.1.zip"
+
+ORACLETAR="instantclient-basic-linux-x86-64-11.2.0.2.0.zip"
ORACLE="instantclient_11_2"
-ORACLEDEVELTAR="instantclient-sdk-linux32-11.2.0.1.zip"
+ORACLEDEVELTAR="instantclient-sdk-linux-x86-64-11.2.0.2.0.zip"
ORACLE_PDO=""
@@ -139,7 +143,7 @@
function include_imap()
{
cd $1 &&\
- make lmd SSLTYPE=unix.nopwd IP6=4 &&\
+ make lmd SSLTYPE=unix.nopwd IP6=4 EXTRACFLAGS=-fPIC&&\
ln -s c-client include &&\
mkdir lib &&\
cd lib &&\
@@ -206,22 +210,8 @@
./configure &&\
make &&\
make install &&\
-cd ../$APACHE/srclib/apr &&\
-./configure --prefix=/usr/local/apr-httpd/ &&\
-make &&\
-make install &&\
-# Build and install apr-util 1.2
-cd ../apr-util &&\
-./configure --prefix=/usr/local/apr-util-httpd/\
- --with-apr=/usr/local/apr-httpd/ &&\
-make &&\
-make install &&\
-# Configure httpd
-#cd ../../ &&\
-#./configure --with-apr=/usr/local/apr-httpd/\
-# --with-apr-util=/usr/local/apr-util-httpd/\
-cd ../../ &&\
-./configure --with-included-apr\
+cd ../$APACHE &&\
+./configure \
--with-mpm=prefork\
--enable-so\
--enable-deflate\
@@ -264,6 +254,9 @@
--with-mcrypt\
--enable-soap\
--with-xmlrpc \
+ --with-gettext \
+ --with-snmp \
+ --with-curl \
$ORACLE_PDO &&\
make &&\
make install &&\
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7969] Merge 7953:7968 from trunk,
Sigurd Nes <=