bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'friendika-master'

Browse source
This commit is contained in:
fabrixxm 2011-01-28 07:26:57 +01:00
commit 8257b1b684
18 changed files with 666 additions and 452 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
addon/java_upload/java_upload.php
View file

@ -1,5 +1,77 @@
<?php <?php
/**
*
* Java photo uploader, uses Jumploader
*
* WARNING: This module currently has privacy issues.
* The java package does not pass the permissions array intact and could lead to
* photos being seen by people that were excluded from seeing them.
*
*/
function java_upload_install() {
register_hook('photo_upload_form', 'addon/java_upload/java_upload.php', 'java_upload_form');
register_hook('photo_post_init', 'addon/java_upload/java_upload.php', 'java_upload_post_init');
register_hook('photo_post_end', 'addon/java_upload/java_upload.php', 'java_upload_post_end');
}
function java_upload_uninstall() {
unregister_hook('photo_upload_form', 'addon/java_upload/java_upload.php', 'java_upload_form');
unregister_hook('photo_post_init', 'addon/java_upload/java_upload.php', 'java_upload_post_init');
unregister_hook('photo_post_end', 'addon/java_upload/java_upload.php', 'java_upload_post_end');
}
function java_upload_form(&$a,&$b) {
$uploadurl = $b['post_url'];
$sessid = session_id();
$archive = $a->get_baseurl() . '/addon/java_upload/jumploader_z.jar';
$filestext = t('Select files to upload: ');
$nojava = t('Use the following controls only if the Java uploader [above] fails to launch.');
$b['default_upload'] = true;
$b['addon_text'] .= <<< EOT
<div id="photos-upload-select-files-text">$filestext</div>
<div id="photos_upload_applet_wrapper">
<applet name="jumpLoaderApplet"
code="jmaster.jumploader.app.JumpLoaderApplet.class"
archive="$archive"
width="700"
height="600"
mayscript >
<param name="uc_uploadUrl" value="$uploadurl" />
<param name="uc_uploadFormName" value="photos-upload-form" />
<param name="gc_loggingLeveL" value="FATAL" />
<param name="uc_fileParameterName" value="userfile" />
<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
<param name="vc_disableLocalFileSystem" value="false" />
<param name="vc_uploadViewMenuBarVisible" value="false" />
<param name="vc_mainViewFileListViewVisible" value="true" />
<param name="vc_mainViewFileListViewHeightPercent" value="50" />
<param name="vc_mainViewFileTreeViewVisible" value="true" />
<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
<param name="vc_lookAndFeel" value="system" />
</applet>
</div>
<div id="photos-upload-no-java-message" >
$nojava
</div>
EOT;
}

BIN
addon/java_upload/jumploader_z.jar Normal file
View file

Binary file not shown.

178
addon/js_upload/js_upload.php
View file

@ -1,20 +1,98 @@
<?php <?php
/**
*
* JavaScript Photo/Image Uploader
*
* Uses Valum 'qq' Uploader.
* Module Author: Chris Case
*
* Prior to enabling, ensure that you have a directory 'uploads'
* which is writable by the web server.
*
*/
function js_upload_install() { function js_upload_install() {
register_hooks('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); register_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
register_hooks('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); register_hook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init');
register_hooks('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); register_hook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file');
register_hook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end');
} }
function js_upload_uninstall() { function js_upload_uninstall() {
register_hooks('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); unregister_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
register_hooks('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); unregister_hook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init');
register_hooks('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); unregister_hook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file');
unregister_hook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end');
} }
function js_upload_form(&$a,&$b) {
$b['default_upload'] = false;
$b['addon_text'] .= '<link href="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
$b['addon_text'] .= '<script src="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
$b['addon_text'] .= <<< EOT
<div id="file-uploader-demo1">
<noscript>
<p>Please enable JavaScript to use file uploader.</p>
<!-- or put a simple form for upload here -->
</noscript>
</div>
<script type="text/javascript">
var uploader = null;
function getSelected(opt) {
var selected = new Array();
var index = 0;
for (var intLoop = 0; intLoop < opt.length; intLoop++) {
if ((opt[intLoop].selected) ||
(opt[intLoop].checked)) {
index = selected.length;
//selected[index] = new Object;
selected[index] = opt[intLoop].value;
//selected[index] = intLoop;
}
}
return selected;
}
function createUploader() {
uploader = new qq.FileUploader({
element: document.getElementById('file-uploader-demo1'),
action: '{$b['post_url']}',
debug: true,
onSubmit: function(id,filename) {
uploader.setParams( {
newalbum : document.getElementById('photos-upload-newalbum').value,
album : document.getElementById('photos-upload-album-select').value,
group_allow : getSelected(document.getElementById('group_allow')).join(','),
contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
group_deny : getSelected(document.getElementById('group_deny')).join(','),
contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
});
}
});
}
// in your app create uploader as soon as the DOM is ready
// don't wait for the window to load
window.onload = createUploader;
</script>
EOT;
}
function js_upload_post_init(&$a,&$b) { function js_upload_post_init(&$a,&$b) {
// list of valid extensions, ex. array("jpeg", "xml", "bmp") // list of valid extensions, ex. array("jpeg", "xml", "bmp")
@ -26,7 +104,9 @@ function js_upload_post_init(&$a,&$b) {
$sizeLimit = 6 * 1024 * 1024; $sizeLimit = 6 * 1024 * 1024;
$uploader = new qqFileUploader($allowedExtensions, $sizeLimit); $uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
$result = $uploader->handleUpload('uploads/');
$result = $uploader->handleUpload();
// to pass data through iframe you will need to encode all html tags // to pass data through iframe you will need to encode all html tags
$a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES); $a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
@ -36,22 +116,26 @@ function js_upload_post_init(&$a,&$b) {
killme(); killme();
} }
$a->data['upload_result'] = $result;
} }
function js_upload_photo_post_file(&$a,&$b) { function js_upload_post_file(&$a,&$b) {
$b['src'] = 'uploads/'.$result['filename']; $result = $a->data['upload_result'];
$b['src'] = $result['path'];
$b['filename'] = $result['filename']; $b['filename'] = $result['filename'];
$b['filesize'] = filesize($src); $b['filesize'] = filesize($b['src']);
} }
function js_upload_photo_post_end(&$a,&$b) { function js_upload_post_end(&$a,&$b) {
logger('upload_post_end');
if(x($a->data,'upload_jsonresponse')) { if(x($a->data,'upload_jsonresponse')) {
echo $a->data['upload_jsonresponse']; echo $a->data['upload_jsonresponse'];
@unlink($src);
killme(); killme();
} }
@ -62,30 +146,36 @@ function js_upload_photo_post_end(&$a,&$b) {
* Handle file uploads via XMLHttpRequest * Handle file uploads via XMLHttpRequest
*/ */
class qqUploadedFileXhr { class qqUploadedFileXhr {
private $pathnm = '';
/** /**
* Save the file to the specified path * Save the file in the temp dir.
* @return boolean TRUE on success * @return boolean TRUE on success
*/ */
function save($path) { function save() {
$input = fopen("php://input", "r"); $input = fopen("php://input", "r");
$temp = tmpfile(); $this->pathnm = tempnam(sys_get_temp_dir(),'frn');
$temp = fopen($this->pathnm,"w");
$realSize = stream_copy_to_stream($input, $temp); $realSize = stream_copy_to_stream($input, $temp);
fclose($input); fclose($input);
fclose($temp);
if ($realSize != $this->getSize()){ if ($realSize != $this->getSize()){
return false; return false;
} }
$target = fopen($path, "w");
fseek($temp, 0, SEEK_SET);
stream_copy_to_stream($temp, $target);
fclose($target);
return true; return true;
} }
function getPath() {
return $this->pathnm;
}
function getName() { function getName() {
return $_GET['qqfile']; return $_GET['qqfile'];
} }
function getSize() { function getSize() {
if (isset($_SERVER["CONTENT_LENGTH"])){ if (isset($_SERVER["CONTENT_LENGTH"])){
return (int)$_SERVER["CONTENT_LENGTH"]; return (int)$_SERVER["CONTENT_LENGTH"];
@ -98,17 +188,24 @@ class qqUploadedFileXhr {
/** /**
* Handle file uploads via regular form post (uses the $_FILES array) * Handle file uploads via regular form post (uses the $_FILES array)
*/ */
class qqUploadedFileForm { class qqUploadedFileForm {
/** /**
* Save the file to the specified path * Save the file to the specified path
* @return boolean TRUE on success * @return boolean TRUE on success
*/ */
function save($path) {
if(!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)){
return false; function save() {
}
return true; return true;
} }
function getPath() {
return $_FILES['qqfile']['tmp_name'];
}
function getName() { function getName() {
return $_FILES['qqfile']['name']; return $_FILES['qqfile']['name'];
} }
@ -116,6 +213,7 @@ class qqUploadedFileForm {
return $_FILES['qqfile']['size']; return $_FILES['qqfile']['size'];
} }
} }
class qqFileUploader { class qqFileUploader {
private $allowedExtensions = array(); private $allowedExtensions = array();
private $sizeLimit = 10485760; private $sizeLimit = 10485760;
@ -136,6 +234,7 @@ class qqFileUploader {
} else { } else {
$this->file = false; $this->file = false;
} }
} }
private function checkServerSettings(){ private function checkServerSettings(){
@ -162,10 +261,7 @@ class qqFileUploader {
/** /**
* Returns array('success'=>true) or array('error'=>'error message') * Returns array('success'=>true) or array('error'=>'error message')
*/ */
function handleUpload($uploadDirectory, $replaceOldFile = FALSE){ function handleUpload(){
if (!is_writable($uploadDirectory)){
return array('error' => t('Server error. Upload directory isn't writable.'));
}
if (!$this->file){ if (!$this->file){
return array('error' => t('No files were uploaded.')); return array('error' => t('No files were uploaded.'));
@ -192,7 +288,7 @@ class qqFileUploader {
$pathinfo = pathinfo($this->file->getName()); $pathinfo = pathinfo($this->file->getName());
$filename = $pathinfo['filename']; $filename = $pathinfo['filename'];
//$filename = md5(uniqid());
$ext = $pathinfo['extension']; $ext = $pathinfo['extension'];
if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){ if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
@ -200,18 +296,18 @@ class qqFileUploader {
return array('error' => t('File has an invalid extension, it should be one of ') . $these . '.'); return array('error' => t('File has an invalid extension, it should be one of ') . $these . '.');
} }
if(!$replaceOldFile){ if ($this->file->save()){
/// don't overwrite previous files that were uploaded return array(
while (file_exists($uploadDirectory . $filename . '.' . $ext)) { 'success'=>true,
$filename .= rand(10, 99); 'path' => $this->file->getPath(),
} 'filename' => $filename . '.' . $ext
} );
if ($this->file->save($uploadDirectory . $filename . '.' . $ext)){
return array('success'=>true,'filename' => $filename . '.' . $ext);
} else { } else {
return array('error'=> t('Could not save uploaded file.') . return array(
t('The upload was cancelled, or server error encountered'),'filename' => $filename . '.' . $ext); 'error'=> t('Upload was cancelled, or server error encountered'),
'path' => $this->file->getPath(),
'filename' => $filename . '.' . $ext
);
} }
} }

6
boot.php
View file

@ -3,7 +3,7 @@
set_time_limit(0); set_time_limit(0);
define ( 'BUILD_ID', 1033 ); define ( 'BUILD_ID', 1033 );
define ( 'FRIENDIKA_VERSION', '2.01.1006' ); define ( 'FRIENDIKA_VERSION', '2.10.0902' );
define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
@ -1692,7 +1692,7 @@ function get_tags($s) {
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
if(preg_match_all('/([@#][^ \x0D\x0A,:?]*)([ \x0D\x0A,:?]|$)/',$s,$match)) { if(preg_match_all('/([@#][^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) {
foreach($match[1] as $match) { foreach($match[1] as $match) {
if(strstr($match,"]")) { if(strstr($match,"]")) {
// we might be inside a bbcode color tag - leave it alone // we might be inside a bbcode color tag - leave it alone
@ -1878,7 +1878,7 @@ function aes_encrypt($val,$ky)
if(! function_exists('linkify')) { if(! function_exists('linkify')) {
function linkify($s) { function linkify($s) {
$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" >$1</a>', $s); $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
return($s); return($s);
}} }}

8
htconfig.php
View file

@ -64,4 +64,12 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
$a->config['system']['rino_encrypt'] = true; $a->config['system']['rino_encrypt'] = true;
// Addons or plugins are configured here.
// This is a comma seperated list of addons to enable. Example:
// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
$a->config['system']['addon'] = 'js_upload';

6
include/bbcode.php
View file

@ -22,10 +22,10 @@ function bbcode($Text) {
// Perform URL Search // Perform URL Search
$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]+)/", ' <a href="$2" >$2</a>', $Text); $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" >$1</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text);
$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" >$2</a>', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text);
//$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text); //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text);

BIN
jumploader_z.jar
View file

Binary file not shown.

110
mod/photos.php
View file

@ -1,5 +1,4 @@
<?php <?php
require_once('include/Photo.php'); require_once('include/Photo.php');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
@ -49,9 +48,18 @@ function photos_init(&$a) {
function photos_post(&$a) { function photos_post(&$a) {
logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
foreach($_REQUEST AS $key => $val) {
logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
}
foreach($_FILES AS $key => $val) {
logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
}
$can_post = false; $can_post = false;
$visitor = 0; $visitor = 0;
@ -466,18 +474,20 @@ function photos_post(&$a) {
} }
// default post action - upload a photo /**
* default post action - upload a photo
*/
if(! x($_FILES,'userfile')) call_hooks('photo_post_init', $_POST);
killme();
if($_POST['partitionCount']) /**
$java_upload = true; * Determine the album to use
else */
$java_upload = false;
$album = notags(trim($_POST['album'])); $album = notags(trim($_REQUEST['album']));
$newalbum = notags(trim($_POST['newalbum'])); $newalbum = notags(trim($_REQUEST['newalbum']));
logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG');
if(! strlen($album)) { if(! strlen($album)) {
if(strlen($newalbum)) if(strlen($newalbum))
@ -486,6 +496,16 @@ function photos_post(&$a) {
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
} }
/**
*
* We create a wall item for every photo, but we don't want to
* overwhelm the data stream with a hundred newly uploaded photos.
* So we will make one photo (the first one uploaded to this album)
* visible by default, the rest will become visible over time when and if
* they acquire comments, likes, dislikes, and/or tags
*
*/
$r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d", $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
dbesc($album), dbesc($album),
intval($page_owner_uid) intval($page_owner_uid)
@ -495,15 +515,25 @@ function photos_post(&$a) {
else else
$visible = 0; $visible = 0;
$str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow'])));
$str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
$str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny'])));
$str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',',$_REQUEST['contact_deny'])));
$str_group_allow = perms2str($_POST['group_allow']); $ret = array('src' => '', 'filename' => '', 'filesize' => 0);
$str_contact_allow = perms2str($_POST['contact_allow']);
$str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']);
$src = $_FILES['userfile']['tmp_name']; call_hooks('photo_post_file',$ret);
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']); if(x($ret,'src') && x($ret,'filesize')) {
$src = $ret['src'];
$filename = $ret['filename'];
$filesize = $ret['filesize'];
}
else {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
}
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
@ -513,10 +543,13 @@ function photos_post(&$a) {
return; return;
} }
logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG');
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$ph = new Photo($imagedata); $ph = new Photo($imagedata);
if(! $ph->is_valid()) { if(! $ph->is_valid()) {
logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG');
notice( t('Unable to process image.') . EOL ); notice( t('Unable to process image.') . EOL );
@unlink($src); @unlink($src);
killme(); killme();
@ -524,7 +557,7 @@ function photos_post(&$a) {
@unlink($src); @unlink($src);
$width = $ph->getWidth(); $width = $ph->getWidth();
$height = $ph->getHeight(); $height = $ph->getHeight();
$smallest = 0; $smallest = 0;
@ -534,6 +567,7 @@ function photos_post(&$a) {
$r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if(! $r) { if(! $r) {
logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG');
notice( t('Image upload failed.') . EOL ); notice( t('Image upload failed.') . EOL );
killme(); killme();
} }
@ -555,7 +589,6 @@ function photos_post(&$a) {
// Create item container // Create item container
$arr = array(); $arr = array();
$arr['uid'] = $page_owner_uid; $arr['uid'] = $page_owner_uid;
@ -584,14 +617,13 @@ function photos_post(&$a) {
$item_id = item_store($arr); $item_id = item_store($arr);
if(! $java_upload) { call_hooks('photo_post_end',intval($item_id));
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
return; // NOTREACHED
}
killme(); // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
return; // NOTREACHED // if they do not wish to be redirected
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
// NOTREACHED
} }
@ -737,6 +769,22 @@ function photos_content(&$a) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$albumselect .= '</select>'; $albumselect .= '</select>';
$uploader = '';
$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
'addon_text' => $uploader,
'default_upload' => true);
call_hooks('photo_upload_form',$ret);
$default_upload = '<input type="file" name="userfile" /> <div class="photos-upload-submit-wrapper" >
<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
$tpl = load_view_file('view/photos_upload.tpl'); $tpl = load_view_file('view/photos_upload.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$pagename' => t('Upload Photos'), '$pagename' => t('Upload Photos'),
@ -744,14 +792,13 @@ function photos_content(&$a) {
'$nickname' => $a->data['user']['nickname'], '$nickname' => $a->data['user']['nickname'],
'$newalbum' => t('New album name: '), '$newalbum' => t('New album name: '),
'$existalbumtext' => t('or existing album name: '), '$existalbumtext' => t('or existing album name: '),
'$filestext' => t('Select files to upload: '),
'$albumselect' => $albumselect, '$albumselect' => $albumselect,
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
'$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)), '$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)),
'$archive' => $a->get_baseurl() . '/jumploader_z.jar', '$uploader' => $ret['addon_text'],
'$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'), '$default' => (($ret['default_upload']) ? $default_upload : ''),
'$uploadurl' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'], '$uploadurl' => $ret['post_url']
'$submit' => t('Submit')
)); ));
return $o; return $o;
@ -1154,3 +1201,4 @@ function photos_content(&$a) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }

2
util/extract.php
View file

@ -3,7 +3,7 @@
$arr = array(); $arr = array();
$files = array('index.php','boot.php'); $files = array('index.php','boot.php');
$files = array_merge($files,glob('mod/*'),glob('include/*')); $files = array_merge($files,glob('mod/*'),glob('include/*'),glob('addon/*/*'));
foreach($files as $file) { foreach($files as $file) {

15
util/strings.php
View file

@ -163,6 +163,7 @@ $a->strings['Private Message'] = 'Private Message';
$a->strings['This is you'] = 'This is you'; $a->strings['This is you'] = 'This is you';
$a->strings['View $name\'s profile'] = 'View $name\'s profile'; $a->strings['View $name\'s profile'] = 'View $name\'s profile';
$a->strings['Item has been removed.'] = 'Item has been removed.'; $a->strings['Item has been removed.'] = 'Item has been removed.';
$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
$a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.'; $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.'; $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
$a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.'; $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
@ -211,7 +212,6 @@ $a->strings['Send invitations'] = 'Send invitations';
$a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:'; $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
$a->strings['Your message:'] = 'Your message:'; $a->strings['Your message:'] = 'Your message:';
$a->strings['Please join my social network on '] = 'Please join my social network on '; $a->strings['Please join my social network on '] = 'Please join my social network on ';
$a->strings["\r\n"] = "\r\n";
$a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:'; $a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:';
$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:'; $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:';
$a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
@ -287,9 +287,7 @@ $a->strings['No photos selected'] = 'No photos selected';
$a->strings['Upload Photos'] = 'Upload Photos'; $a->strings['Upload Photos'] = 'Upload Photos';
$a->strings['New album name: '] = 'New album name: '; $a->strings['New album name: '] = 'New album name: ';
$a->strings['or existing album name: '] = 'or existing album name: '; $a->strings['or existing album name: '] = 'or existing album name: ';
$a->strings['Select files to upload: '] = 'Select files to upload: ';
$a->strings['Permissions'] = 'Permissions'; $a->strings['Permissions'] = 'Permissions';
$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Use the following controls only if the Java uploader [above] fails to launch.';
$a->strings['Edit Album'] = 'Edit Album'; $a->strings['Edit Album'] = 'Edit Album';
$a->strings['View Photo'] = 'View Photo'; $a->strings['View Photo'] = 'View Photo';
$a->strings['Photo not available'] = 'Photo not available'; $a->strings['Photo not available'] = 'Photo not available';
@ -340,7 +338,6 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your
$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.";
$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'; $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.';
$a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: ";
$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
$a->strings['Registration'] = 'Registration'; $a->strings['Registration'] = 'Registration';
$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': ';
$a->strings['Your Email Address: '] = 'Your Email Address: '; $a->strings['Your Email Address: '] = 'Your Email Address: ';
@ -467,6 +464,16 @@ $a->strings['Uncertain'] = 'Uncertain';
$a->strings['Complicated'] = 'Complicated'; $a->strings['Complicated'] = 'Complicated';
$a->strings['Don\'t care'] = 'Don\'t care'; $a->strings['Don\'t care'] = 'Don\'t care';
$a->strings['Ask me'] = 'Ask me'; $a->strings['Ask me'] = 'Ask me';
$a->strings['Facebook status update failed.'] = 'Facebook status update failed.';
$a->strings['Select files to upload: '] = 'Select files to upload: ';
$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Use the following controls only if the Java uploader [above] fails to launch.';
$a->strings['No files were uploaded.'] = 'No files were uploaded.';
$a->strings['Uploaded file is empty'] = 'Uploaded file is empty';
$a->strings['Uploaded file is too large'] = 'Uploaded file is too large';
$a->strings['File has an invalid extension, it should be one of '] = 'File has an invalid extension, it should be one of ';
$a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered';
$a->strings['Randplace Settings'] = 'Randplace Settings';
$a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
$a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; $a->strings['Africa/Abidjan'] = 'Africa/Abidjan';
$a->strings['Africa/Accra'] = 'Africa/Accra'; $a->strings['Africa/Accra'] = 'Africa/Accra';
$a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';

6
view/en/htconfig.tpl
View file

@ -62,3 +62,9 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
$a->config['system']['rino_encrypt'] = true; $a->config['system']['rino_encrypt'] = true;
// Addons or plugins are configured here.
// This is a comma seperated list of addons to enable. Example:
// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
$a->config['system']['addon'] = 'js_upload';

2
view/fr/head.tpl
View file

@ -11,7 +11,7 @@
<script type="text/javascript" src="$baseurl/include/main.js" ></script> <script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script> <script>
function confirmDelete() { return confirm("Delete this item?"); } function confirmDelete() { return confirm("Effacer cet élément?"); }
function commentOpen(obj,id) { function commentOpen(obj,id) {
if(obj.value == 'Comment') { if(obj.value == 'Comment') {
obj.value = ''; obj.value = '';

4
view/fr/profile_listing_header.tpl
View file

@ -1,8 +1,8 @@
<h1>Profiles</h1> <h1>Profiles</h1>
<p id="profile-listing-desc" > <p id="profile-listing-desc" >
<a href="profile_photo" >Change profile photo</a> <a href="profile_photo" >Changer la photo du profil</a>
</p> </p>
<div id="profile-listing-new-link-wrapper" > <div id="profile-listing-new-link-wrapper" >
<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a> <a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Créer un nouveau profil</a>
</div> </div>

2
view/fr/registrations.tpl
View file

@ -1 +1 @@
<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li> <li>$fullname ($email) : <a href="$approvelink">Approuver</a> - <a href="$denylink">Refuser</a></li>

665
view/fr/strings.php
View file

File diff suppressed because it is too large Load diff

35
view/photos_upload.tpl
View file

@ -23,41 +23,12 @@
</div> </div>
<div id="photos-upload-select-files-text">$filestext</div> <div id="photos-upload-spacer"></div>
<div id="photos_upload_applet_wrapper"> $uploader
<applet name="jumpLoaderApplet"
code="jmaster.jumploader.app.JumpLoaderApplet.class"
archive="$archive"
width="700"
height="600"
mayscript >
<param name="uc_uploadUrl" value="$uploadurl" />
<param name="uc_uploadFormName" value="photos-upload-form" />
<param name="gc_loggingLeveL" value="FATAL" />
<param name="uc_fileParameterName" value="userfile" />
<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
<param name="vc_disableLocalFileSystem" value="false" />
<param name="vc_uploadViewMenuBarVisible" value="false" />
<param name="vc_mainViewFileListViewVisible" value="true" />
<param name="vc_mainViewFileListViewHeightPercent" value="50" />
<param name="vc_mainViewFileTreeViewVisible" value="true" />
<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
<param name="vc_lookAndFeel" value="system" />
</applet>
</div>
<div id="photos-upload-no-java-message" > $default
$nojava
</div>
<input type="file" name="userfile" />
<div class="photos-upload-submit-wrapper" >
<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
</div>
<div class="photos-upload-end" ></div> <div class="photos-upload-end" ></div>
</form> </form>

3
view/theme/default/style.css
View file

@ -1727,6 +1727,9 @@ a.mail-list-link {
#photos-upload-album-select { #photos-upload-album-select {
float: left; float: left;
} }
#photos-upload-spacer {
margin-top: 25px;
}
#photos-upload-new-end, #photos-upload-exist-end { #photos-upload-new-end, #photos-upload-exist-end {
clear: both; clear: both;
} }

4
view/theme/duepuntozero/style.css
View file

@ -1600,6 +1600,10 @@ a.mail-list-link {
#photos-upload-album-select { #photos-upload-album-select {
float: left; float: left;
} }
#photos-upload-spacer {
margin-top: 25px;
}
#photos-upload-new-end, #photos-upload-exist-end { #photos-upload-new-end, #photos-upload-exist-end {
clear: both; clear: both;
} }