New patches: [unrevert anonymous**20090106212612] { hunk ./actions/profilesettings.php 140 common_local_url('profilesettings'))); common_hidden('token', common_session_token()); +v v v v v v v if ($original) { hunk ./actions/profilesettings.php 142 + common_element_start('div', array('id'=>'avatar_original', 'class'=>'avatar_view')); + common_element('h3', null, _("Original:")); + common_element_start('div', array('id'=>'avatar_original_view')); common_element('img', array('src' => $original->url, 'class' => 'avatar original', 'width' => $original->width, hunk ./actions/profilesettings.php 150 'height' => $original->height, 'alt' => $user->nickname)); + common_element_end('div'); + common_element_end('div'); } hunk ./actions/profilesettings.php 153 +************* + if ($original) { + common_element('img', array('src' => $original->url, + 'class' => 'avatar original', + 'width' => $original->width, + 'height' => $original->height, + 'alt' => $user->nickname)); + } +^ ^ ^ ^ ^ ^ ^ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); hunk ./actions/profilesettings.php 165 +v v v v v v v if ($avatar) { hunk ./actions/profilesettings.php 167 - common_element('img', array('src' => $avatar->url, + common_element_start('div', array('id'=>'avatar_preview', 'class'=>'avatar_view')); + common_element('h3', null, _("Preview:")); + common_element_start('div', array('id'=>'avatar_preview_view')); + common_element('img', array('src' => $original->url,//$avatar->url, 'class' => 'avatar profile', 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, hunk ./actions/profilesettings.php 175 'alt' => $user->nickname)); + common_element_end('div'); + common_element_end('div'); + + foreach(array('avatar_crop_x', 'avatar_crop_y', 'avatar_crop_w', 'avatar_crop_h') as $crop_info) { + common_element('input', array('name' => $crop_info, + 'type' => 'hidden', + 'id' => $crop_info)); + } + common_submit('avatar_crop', _('Crop')); } hunk ./actions/profilesettings.php 185 +************* + if ($avatar) { + common_element('img', array('src' => $avatar->url, + 'class' => 'avatar profile', + 'width' => AVATAR_PROFILE_SIZE, + 'height' => AVATAR_PROFILE_SIZE, + 'alt' => $user->nickname)); + } +^ ^ ^ ^ ^ ^ ^ common_element('input', array('name' => 'MAX_FILE_SIZE', } Context: [Jcrop CSS updates to original/preview views csarven@controlyourself.ca**20081210025922] [Jcrop v2 (POST cropping to be completed) csarven@controlyourself.ca**20081210021607] [trac750 added some output to the facebook_update.php script Zach Copley **20090105045603] [trac750 configurable sync flags for Facebook app (noticesync, replysync) Zach Copley **20090105040212] [trac750 Automatically update linked Facebook users' statuses Zach Copley **20090105010407] [wrapper element for config.xml Evan Prodromou **20081230212202] [better serialization of arrays and booleans in config output Evan Prodromou **20081230211957] [implement the api/laconica/config method Evan Prodromou **20081230211444] [add some breaks so that switch statement works Evan Prodromou **20081230210114] [implement api/laconica/version method Evan Prodromou **20081230205939] [add laconica methods to unauthed ones Evan Prodromou **20081230203747] [add laconica-specific methods to htaccess.sample Evan Prodromou **20081230202513] [Laconica-specific extensions for Twitter API Evan Prodromou **20081230202019] [whitespace changes in actions/register.php after global search-and-replace Evan Prodromou **20081223195722] [Twitter-bridge: fix for Twitter's new strict policy of rejecting HTTP POSTs with invalid "expect" headers Zach Copley **20081225152207] [move opening brace of class declaration to next line Evan Prodromou **20081223194923 Another gigantor PEAR coding standards patch. Here, I've moved the opening curly bracket on a class statement to the following line. ] [TRUE => true, FALSE => false Evan Prodromou **20081223194428 More PEAR coding standards global changes. Here, I've changed all instances of TRUE to true and FALSE to false. ] [change function headers to K&R style Evan Prodromou **20081223193323 Another huge change, for PEAR code standards compliance. Function headers have to be in K&R style (opening brace on its own line), instead of having the opening brace on the same line as the function and parameters. So, a little perl magic found all the function definitions and move the opening brace to the next line (properly indented... usually). ] [replace NULL with null Evan Prodromou **20081223192129 Another global search-and-replace update. Here, I've replaced the PHP keyword 'NULL' with its lowercase version. This is another PEAR code standards change. ] [replace all tabs with four spaces Evan Prodromou **20081223191907 The PEAR coding standards decree: no tabs, but indent by four spaces. I've done a global search-and-replace on all tabs, replacing them by four spaces. This is a huge change, but it will go a long way to getting us towards phpcs-compliance. And that means better code readability, and that means more participation. ] [incorrect label on notice list file comment Evan Prodromou **20081223191430] [bring lib/noticelist.php into line with PEAR code standards Evan Prodromou **20081223190851] [reformat and document lib/mail.php for phpcs conformance Evan Prodromou **20081223173330] [bring messaging section (inbox, outbox, mailbox) into PEAR Code Standards compliance Evan Prodromou **20081222201304 Actually refactored the method names on these classes to come into complete compliance with the code standards. Untested; maybe there are some bad method names now. ] [bring mailbox.php into line with PEAR Coding Standards (mostly) Evan Prodromou **20081222195041] [reformat lib/language.php for PEAR Coding Standards Evan Prodromou **20081222193029] [reformat lib/jabber.php for phpcs, including doc comments Evan Prodromou **20081222173249] [reformat for phpcs Evan Prodromou **20081221005837] [reformat lib/daemon.php for phpcs Evan Prodromou **20081221004607] [some modifications to assuage phpcs Evan Prodromou **20081221003955] [reformatting for phpcs in lib/util.php Evan Prodromou **20081221003016] [first step of phpcs-cleanup of index.php Evan Prodromou **20081221002332] [more information in subscription notices Evan Prodromou **20081212171135] [identica badge by Kent Brewster. For more information see: Sarven Capadisli **20081218003302 http://kentbrewster.com/identica-badge/ Copy and paste the following wherever you want the badge to show up: Substitute your own ID in the user parameter. ] [TAG 0.6.4.1 Evan Prodromou **20081220204906] Patch bundle hash: b75aa06ac49c2ff8a9fa803da998c6ea5f5c1d17