" . date('r') . "\n";
- //echo "
Script: $script" . "\n";
- $handle = popen($script . ' 2>&1', 'r');
- //echo "
Handle: $handle; " . gettype($handle) . "\n";
- echo "
: 20090828
- // Just use system call
- $handle = popen($script . ' 2>&1', 'r');
+ $usrpass = '--user=perki2_pmgruser --password=pmgrauth';
+ $boxdb = 'perki2_pmgr_' . $type;
+
+ $handle = popen("mysqldump $usrpass --opt perki2_pmgr" .
+ " | mysql $usrpass --database=$boxdb", 'r');
while (($read = fread($handle, 2096))) {
// Do nothing
}
pclose($handle);
$url = $_SERVER['HTTP_REFERER'];
- if (empty($url))
- $url = "/";
+ if (empty($url) || $url == 'undefined')
+ $url = "/$type";
$this->redirect($url);
}
diff --git a/site/models/contact.php b/site/models/contact.php
index 43ad9e0..554d91f 100644
--- a/site/models/contact.php
+++ b/site/models/contact.php
@@ -91,7 +91,7 @@ class Contact extends AppModel {
// If the user has entered all new data, we need to
// save that as a brand new entry.
- if (!isset($item['id'])) {
+ if (!isset($item['id']) || $item['source'] == 'new') {
$I = new $class();
$I->create();
if (!$I->save($item, false)) {
diff --git a/site/plugins/debug_kit/controllers/components/toolbar.php b/site/plugins/debug_kit/controllers/components/toolbar.php
index 0b72acb..64adf7a 100644
--- a/site/plugins/debug_kit/controllers/components/toolbar.php
+++ b/site/plugins/debug_kit/controllers/components/toolbar.php
@@ -163,7 +163,7 @@ class ToolbarComponent extends Object {
trigger_error(sprintf(__('Could not load DebugToolbar panel %s', true), $panel), E_USER_WARNING);
continue;
}
- $panelObj =& new $className();
+ $panelObj = new $className();
if (is_subclass_of($panelObj, 'DebugPanel') || is_subclass_of($panelObj, 'debugpanel')) {
$this->panels[$panel] =& $panelObj;
}
@@ -456,7 +456,7 @@ class LogPanel extends DebugPanel {
* @return array
*/
function _parseFile($filename) {
- $file =& new File($filename);
+ $file = new File($filename);
$contents = $file->read();
$timePattern = '/(\d{4}-\d{2}\-\d{2}\s\d{1,2}\:\d{1,2}\:\d{1,2})/';
$chunks = preg_split($timePattern, $contents, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
diff --git a/site/plugins/debug_kit/views/elements/timer_panel.ctp b/site/plugins/debug_kit/views/elements/timer_panel.ctp
index 1ec74d6..3d9d594 100644
--- a/site/plugins/debug_kit/views/elements/timer_panel.ctp
+++ b/site/plugins/debug_kit/views/elements/timer_panel.ctp
@@ -30,14 +30,14 @@ $timers = DebugKitDebugger::getTimers();
?>
- precision(DebugKitDebugger::requestTime(), 6)); ?>
+
message(__('Total Request Time:', true), $totalTime)?>
$timeInfo):
$rows[] = array(
$timeInfo['message'],
- $number->precision($timeInfo['time'], 6)
+ sprintf(__('%.6s', true), $timeInfo['time'])
);
$headers = array(__('Message', true), __('time in seconds', true));
endforeach;
diff --git a/site/valley_storage.pmgr.htpasswd b/site/valley_storage.pmgr.htpasswd
new file mode 100644
index 0000000..343a1ef
--- /dev/null
+++ b/site/valley_storage.pmgr.htpasswd
@@ -0,0 +1,9 @@
+abijah:Property Manager:a2369e3cc9e231ea6f02ce799a8b9970
+anja:Property Manager:4539d5a6e58dd5895f2f3891d29705b0
+kevin:Property Manager:f01accc9f5e5cdfc028dcf0cca837cf1
+adam:Property Manager:ae6835569bb2fc0a0a4a773580ac8cda
+shirley:Property Manager:e7e9d674c700796c99cdbf3cf105e739
+admin:Property Manager:bab2226685d9b4b66220db8df80f1822
+dev:Property Manager:e5c27b3c025e47239a45daceea2c0a00
+vasst:Property Manager:523abc6c2b8458b463d5a9baa4f58f2e
+answerfirst:Property Manager:6ac128447fab8be985c74ba7539c39b3
diff --git a/site/views/contacts/edit.ctp b/site/views/contacts/edit.ctp
index 8ba1941..bacaa7a 100644
--- a/site/views/contacts/edit.ctp
+++ b/site/views/contacts/edit.ctp
@@ -68,7 +68,7 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
'' . "\n" .
// BEGIN method-div
- '' . "\n" .
$obj->element
('form_table',
@@ -131,14 +131,18 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
elseif ($stype === 'new') {
$fields = array
('type' => array('label_attributes' => array('class' => 'required'),
- 'opts' => array('options' => $obj->varstore['phoneTypes']),
+ 'opts' => array('autocomplete' => 'off',
+ 'options' => $obj->varstore['phoneTypes']),
'after' => "Physical type of the phone."),
'phone' => array('label_attributes' => array('class' => 'required empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Required: Phone number."),
'ext' => array('name' => "Extension",
'label_attributes' => array('class' => 'optional empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Optional: Extension number."),
'comment' => array('label_attributes' => array('class' => 'optional empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Optional: Comments about this phone number."),
);
}
@@ -167,17 +171,23 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
elseif ($stype === 'new') {
$fields = array
('address' => array('label_attributes' => array('class' => 'required empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Required: First line of mailing address."),
'city' => array('label_attributes' => array('class' => 'required empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Required."),
'state' => array('label_attributes' => array('class' => 'required empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Required."),
'postcode' => array('name' => 'Zip Code',
'label_attributes' => array('class' => 'required empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Required."),
'country' => array('label_attributes' => array('class' => 'optional empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Optional: USA is presumed."),
'comment' => array('label_attributes' => array('class' => 'optional empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Optional: Comments about this mailing address."),
);
}
@@ -208,8 +218,10 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
elseif ($stype === 'new') {
$fields = array
('email' => array('label_attributes' => array('class' => 'required empty'),
- 'after' => "Required: E-mail address."),
+ 'opts' => array('autocomplete' => 'off'),
+ 'after' => "Required: E-mail address."),
'comment' => array('label_attributes' => array('class' => 'optional empty'),
+ 'opts' => array('autocomplete' => 'off'),
'after' => "Optional: Comments about this email address."),
);
}
diff --git a/site/webroot/index.php b/site/webroot/index.php
index 9c2e5a8..2f0125f 100644
--- a/site/webroot/index.php
+++ b/site/webroot/index.php
@@ -55,7 +55,7 @@
*
*/
if (!defined('CAKE_CORE_INCLUDE_PATH')) {
- define('CAKE_CORE_INCLUDE_PATH', 'D:\Website\localhost\CakePHP');
+ define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . APP_DIR . DS . 'CakePHP');
}
/**