Changeset 189
- Timestamp:
- Jul 1, 2006 12:25:24 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/ACL.inc.php
r178 r189 398 398 } 399 399 400 // If $ parent is null, use root object.401 if (is_null($ parent)) {402 $ parent = 'root';400 // If $new_parent is null, use root object. 401 if (is_null($new_parent)) { 402 $new_parent = 'root'; 403 403 } 404 404 405 405 // Ensure node and parent name aren't empty. 406 if ('' == trim($name) || '' == trim($ parent)) {407 $app->logMsg(sprintf('Cannot add node, parent (%s) or name (%s) missing.', $name, $ parent), LOG_WARNING, __FILE__, __LINE__);406 if ('' == trim($name) || '' == trim($new_parent)) { 407 $app->logMsg(sprintf('Cannot add node, parent (%s) or name (%s) missing.', $name, $new_parent), LOG_WARNING, __FILE__, __LINE__); 408 408 return false; 409 409 } … … 412 412 $qid = $db->query("SELECT lft, rgt FROM $tbl WHERE name = '" . $db->escapeString($name) . "'"); 413 413 if (!list($lft, $rgt) = mysql_fetch_row($qid)) { 414 $app->logMsg(sprintf('Cannot delete nonexistant %s name: %s', $type, $name), LOG_NOTICE, __FILE__, __LINE__);414 $app->logMsg(sprintf('Cannot move nonexistant %s name: %s', $type, $name), LOG_NOTICE, __FILE__, __LINE__); 415 415 return false; 416 416 } … … 448 448 $db->query("UPDATE $tbl SET lft = lft - $total_transversal_value WHERE lft > $rgt"); 449 449 $db->query("UPDATE $tbl SET rgt = rgt - $total_transversal_value WHERE rgt > $rgt"); 450 450 451 // Apply transformation to new parent rgt also. 451 452 $new_parent_rgt = $new_parent_rgt > $rgt ? $new_parent_rgt - $total_transversal_value : $new_parent_rgt; … … 463 464 $db->query("UPDATE $tbl SET rgt = rgt + $total_transversal_value WHERE rgt >= $new_parent_rgt AND $primary_key NOT IN ('" . join("','", $ids) . "')"); 464 465 465 die;466 466 $app->logMsg(sprintf('Moved %s node %s to new parent %s.', $type, $name, $new_parent), LOG_DEBUG, __FILE__, __LINE__); 467 467 return true; -
trunk/lib/App.inc.php
r180 r189 561 561 // SCREEN ACTION 562 562 if ($this->getParam('log_screen_priority') && $priority <= $this->getParam('log_screen_priority')) { 563 echo "[{$event[' date']}] [{$event['type']}] [{$event['file:line']}] [{$event['message']}]\n";563 echo "[{$event['type']}] [{$event['message']}]\n"; 564 564 } 565 565 -
trunk/lib/Auth_SQL.inc.php
r179 r189 845 845 $app->logMsg(sprintf('Password reset but notification failed, no email address for user %s (%s).', $user_data[$this->_params['db_primary_key']], $user_data[$this->_params['db_username_column']]), LOG_NOTICE, __FILE__, __LINE__); 846 846 } else { 847 // Body for email. 848 $email_body = <<<EOF 849 Hello {NAME}, 850 851 Your password at {SITE_NAME} has been reset. {REASON} 852 Your new login information is: 853 854 USERNAME: {USERNAME} 855 PASSWORD: {PASSWORD} 856 857 If you have any questions or concerns please reply to this email or visit the website below. 858 859 Thank you, 860 {SITE_NAME} 861 {SITE_URL}/ 862 863 EOF; 847 // Send the new password in an email. 864 848 $email = new Email(array( 865 849 'to' => $user_data['email'], … … 867 851 'subject' => sprintf('%s password change', $app->getParam('site_name')) 868 852 )); 869 $email->set String($email_body);853 $email->setTemplate('codebase/services/templates/email_reset_password.txt'); 870 854 $email->replace(array( 871 'site_name' => $app->getParam('site_name'), 872 'site_url' => $app->getParam('site_url'), 873 'name' => ('' != $user_data['first_name'] . $user_data['last_name'] ? $user_data['first_name'] . ' ' . $user_data['last_name'] : $user_data[$this->_params['db_username_column']]), 874 'username' => $user_data[$this->_params['db_username_column']], 875 'password' => $password, 876 'reason' => $reason, 855 'SITE_NAME' => $app->getParam('site_name'), 856 'SITE_URL' => $app->getParam('site_url'), 857 'SITE_EMAIL' => $app->getParam('site_email'), 858 'NAME' => ('' != $user_data['first_name'] . $user_data['last_name'] ? $user_data['first_name'] . ' ' . $user_data['last_name'] : $user_data[$this->_params['db_username_column']]), 859 'USERNAME' => $user_data[$this->_params['db_username_column']], 860 'PASSWORD' => $password, 861 'REASON' => ('' == trim($reason) ? '' : trim($reason) . ' '), // Add a space after the reason if it exists for better fromatting. 877 862 )); 878 863 $email->send(); -
trunk/lib/Utilities.inc.php
r180 r189 229 229 switch ($where) { 230 230 case 'start' : 231 return preg_replace(array(sprintf('/^.{4,}(.{%s})$/ ', $part1 + $part2), '/\s*\.{3,}\s*/'), array('...$1', '...'), $str);231 return preg_replace(array(sprintf('/^.{4,}(.{%s})$/sU', $part1 + $part2), '/\s*\.{3,}\s*/sU'), array('...$1', '...'), $str); 232 232 break; 233 233 default : 234 234 case 'middle' : 235 return preg_replace(array(sprintf('/^(.{%s}).{4,}(.{%s})$/ ', $part1, $part2), '/\s*\.{3,}\s*/'), array('$1...$2', '...'), $str);235 return preg_replace(array(sprintf('/^(.{%s}).{4,}(.{%s})$/sU', $part1, $part2), '/\s*\.{3,}\s*/sU'), array('$1...$2', '...'), $str); 236 236 break; 237 237 case 'end' : 238 return preg_replace(array(sprintf('/^(.{%s}).{4,}$/ ', $part1 + $part2), '/\s*\.{3,}\s*/'), array('$1...', '...'), $str);238 return preg_replace(array(sprintf('/^(.{%s}).{4,}$/sU', $part1 + $part2), '/\s*\.{3,}\s*/sU'), array('$1...', '...'), $str); 239 239 break; 240 240 } … … 273 273 274 274 /* 275 * Returns a human readable amount of time elapsed since the given unix timestamp.275 * Returns a human readable amount of time for the given amount of seconds. 276 276 * 277 277 * 45 seconds … … 285 285 * 286 286 * @access public 287 * @param int $ time Unix timestamp of date to find elapsed from.287 * @param int $seconds Seconds of time. 288 288 * @param string $max_unit Key value from the $units array. 289 289 * @param string $format Sprintf formatting string. … … 293 293 * @since 23 Jun 2006 12:15:19 294 294 */ 295 function timeElapsed($time, $max_unit=null, $format='%01.1f') 296 { 297 if ($time <= time()) { 298 $elapsed = $time_diff = time() - $time; 299 } else { 300 $elapsed = $time_diff = $time - time(); 301 } 302 295 function humanTime($seconds, $max_unit=null, $format='%01.1f') 296 { 303 297 // Units 304 298 $units = array( … … 316 310 $max_unit = isset($units[$max_unit]) ? $max_unit : 'decade'; 317 311 312 $final_time = $seconds; 318 313 foreach ($units as $k => $v) { 319 if ($max_unit != $k && $ time_diff>= $v[0]) {320 $ elapsed = $time_diff/ $v[0];314 if ($max_unit != $k && $seconds >= $v[0]) { 315 $final_time = $seconds / $v[0]; 321 316 $last_unit = $k; 322 317 } 323 318 } 324 $ elapsed = sprintf($format, $elapsed);325 return sprintf('%s %s', $ elapsed, (1 == $elapsed? $units[$last_unit][1] : $units[$last_unit][2]));319 $final_time = sprintf($format, $final_time); 320 return sprintf('%s %s', $final_time, (1 == $final_time ? $units[$last_unit][1] : $units[$last_unit][2])); 326 321 } 327 322
Note: See TracChangeset
for help on using the changeset viewer.