From 51b6d709965faa104b02fe148dbe8cf407ff47fa Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 14 May 2015 22:42:48 -0700 Subject: update to_do --- doc/to_do_code.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index fd3923d40..73acdc7bb 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -14,6 +14,7 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Integrate the "open site" list with the register page[/li] [li]implement oembed provider interface[/li] [li]refactor the oembed client interface so that we can safely sandbox remote content[/li] +[li]Many modern social apps now have both a profile photo and a "cover photo". Add support for this. [li]Write more webpage layouts[/li] [li]Write more webpage widgets[/li] [li]restricted access OAuth clients[/li] -- cgit v1.2.3 From ed284fd4ea6e3069e59be94d40e600da93794693 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 May 2015 20:33:38 +0200 Subject: preserve htmlhead in case somebody needs it --- boot.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index ac66c6b4e..8dcc3b56b 100755 --- a/boot.php +++ b/boot.php @@ -2139,7 +2139,9 @@ function construct_page(&$a) { } // And a couple of convenience macros - + if(strpos($v, '$htmlhead') !== false) { + $v = str_replace('$htmlhead', $a->page['htmlhead'], $v); + } if(strpos($v, '$nav') !== false) { $v = str_replace('$nav', $a->page['nav'], $v); } -- cgit v1.2.3 From 70fa00c014fcdbb666ac870873024c41b6609191 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 15 May 2015 22:20:45 +0200 Subject: allow a block to contain $content --- include/comanche.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/comanche.php b/include/comanche.php index 3030ae5c6..fc4e4004b 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -166,12 +166,19 @@ function comanche_block($s, $class = '') { intval($channel_id), dbesc($name) ); + if($r) { $o .= (($var['wrap'] == 'none') ? '' : '
'); if($r[0]['title']) $o .= '

' . $r[0]['title'] . '

'; - $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); + if($r[0]['body'] === '$content') { + $o .= prepare_text(get_app()->data['webpage'][0]['body'], get_app()->data['webpage'][0]['mimetype']); + } + else { + $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); + } + $o .= (($var['wrap'] == 'none') ? '' : '
'); } } -- cgit v1.2.3 From e2980e871fd9d7e769cf19b58c03574d386e542e Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sat, 16 May 2015 11:12:39 +0200 Subject: Add functions to parse and get some values from php.ini. Get upload limits from php.ini. These functions will be used for checking against upload limits and to give information in the frontend. Wasn't sure in which file to put these functions, so I created a new one include/environment.php. --- include/environment.php | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 include/environment.php diff --git a/include/environment.php b/include/environment.php new file mode 100644 index 000000000..47ad241a7 --- /dev/null +++ b/include/environment.php @@ -0,0 +1,66 @@ + 8388608 + * + * \note This method does not recognise other human readable formats like + * 8MB, etc. + * + * @todo Make this function more universal useable. MB, T, etc. + * + * @param string $val value from php.ini e.g. 2M, 8M + * @return int size in bytes + */ +function phpiniSizeToBytes($val) { + $val = trim($val); + $unit = strtolower($val[strlen($val)-1]); + switch($unit) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + } + + return (int)$val; +} \ No newline at end of file -- cgit v1.2.3 From 6757e86e852293f74debc5c011e4a2809471487b Mon Sep 17 00:00:00 2001 From: Klaus Weidenbach Date: Sun, 17 May 2015 01:24:47 +0200 Subject: Add some more documentation to attach_store() --- include/attach.php | 71 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/include/attach.php b/include/attach.php index e6d6e5f24..4bbda9530 100644 --- a/include/attach.php +++ b/include/attach.php @@ -4,10 +4,11 @@ * * @brief File/attach API with the potential for revision control. * - * @TODO: a filesystem storage abstraction which maintains security (and 'data' contains a system filename - * which is inaccessible from the web). This could get around PHP storage limits and store videos and larger - * items, using fread or OS methods or native code to read/write or chunk it through. - * Also an 'append' option to the storage function might be a useful addition. + * @TODO A filesystem storage abstraction which maintains security (and 'data' + * contains a system filename which is inaccessible from the web). This could + * get around PHP storage limits and store videos and larger items, using fread + * or OS methods or native code to read/write or chunk it through. + * @todo Also an 'append' option to the storage function might be a useful addition. */ require_once('include/permissions.php'); @@ -123,7 +124,7 @@ function z_mime_content_type($filename) { * @param string $hash (optional) * @param string $filename (optional) * @param string $filetype (optional) - * @return assoziative array with: + * @return associative array with: * * \e boolean \b success * * \e int|boolean \b results amount of found results, or false * * \e string \b message with error messages if any @@ -161,7 +162,7 @@ function attach_count_files($channel_id, $observer, $hash = '', $filename = '', /** * @brief Returns a list of files/attachments. - * + * * @param $channel_id * @param $observer * @param $hash (optional) @@ -170,10 +171,10 @@ function attach_count_files($channel_id, $observer, $hash = '', $filename = '', * @param $orderby * @param $start * @param $entries - * @return array - * $ret['success'] boolean - * $ret['results'] array with results, or false - * $ret['message'] string with error messages if any + * @return associative array with: + * * \e boolean \b success + * * \e array|boolean \b results array with results, or false + * * \e string \b message with error messages if any */ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '', $orderby = 'created desc', $start = 0, $entries = 0) { @@ -213,11 +214,11 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $ /** * @brief Find an attachment by hash and revision. - * + * * Returns the entire attach structure including data. - * + * * This could exhaust memory so most useful only when immediately sending the data. - * + * * @param string $hash * @param int $rev Revision * @return array @@ -275,7 +276,7 @@ function attach_by_hash($hash, $rev = 0) { * @see attach_by_hash() * @param $hash * @param $rev revision default 0 - * @return array Everything except data. + * @return associative array with everything except data * * \e boolean \b success boolean true or false * * \e string \b message (optional) only when success is false * * \e array \b data array of attach DB entry without data component @@ -326,12 +327,18 @@ function attach_by_hash_nodata($hash, $rev = 0) { } /** - * @brief + * @brief Stores an attachment from a POST file upload. + * + * This function stores an attachment. It can be a new one, a replacement or a + * new revision depending on value set in \e $options. * - * @param $channel channel array of owner - * @param $observer_hash hash of current observer - * @param $options (optional) - * @param $arr (optional) + * @note Requires an input field \e userfile and does not accept multiple files + * in one request. + * + * @param array $channel channel array of owner + * @param string $observer_hash hash of current observer + * @param string $options (optional) one of update, replace, revision + * @param array $arr (optional) associative array */ function attach_store($channel, $observer_hash, $options = '', $arr = null) { @@ -366,7 +373,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { if($options === 'replace') { /** @BUG $replace is undefined here */ - $x = q("select id, hash, filesize from attach where id = %d and uid = %d limit 1", + $x = q("select id, hash, filesize from attach where id = %d and uid = %d limit 1", intval($replace), intval($channel_id) ); @@ -457,7 +464,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { ); } elseif($options === 'update') { - $r = q("update attach set filename = '%s', filetype = '%s', edited = '%s', + $r = q("update attach set filename = '%s', filetype = '%s', edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d", dbesc((array_key_exists('filename',$arr)) ? $arr['filename'] : $x[0]['filename']), dbesc((array_key_exists('filetype',$arr)) ? $arr['filetype'] : $x[0]['filetype']), @@ -551,7 +558,7 @@ function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') { intval(ATTACH_FLAG_DIR) ); if(! $r) { - $ret['message'] = t('Path not available.'); + $ret['message'] = t('Path not available.'); return $ret; } @@ -621,7 +628,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) { // Check for duplicate name. // Check both the filename and the hash as we will be making use of both. - + $r = q("select hash from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1", dbesc($arr['filename']), dbesc($arr['hash']), @@ -644,7 +651,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) { $sql_options = permissions_sql($channel['channel_id']); do { - $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0 + $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0 $sql_options limit 1", intval($channel['channel_id']), dbesc($lfile), @@ -660,7 +667,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) { $lpath = $r[0]['hash'] . '/' . $lpath; $lfile = $r[0]['folder']; } while ( ($r[0]['folder']) && ($r[0]['flags'] & ATTACH_FLAG_DIR)) ; - $path = $basepath . '/' . $lpath; + $path = $basepath . '/' . $lpath; } else $path = $basepath . '/'; @@ -716,7 +723,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) { /** * @brief Changes permissions of a file. - * + * * @param int $channel_id * @param array $resource * @param string $allow_cid @@ -841,7 +848,7 @@ function attach_delete($channel_id, $resource) { * @warning This function cannot be used with mod/dav as it always returns a * path valid under mod/cloud. * - * @param array $arr assoziative array with: + * @param array $arr associative array with: * * \e int \b uid the channel's uid * * \e string \b folder * * \e string \b filename @@ -866,7 +873,7 @@ function get_cloudpath($arr) { $lfile = $arr['folder']; do { - $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0 + $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0 limit 1", intval($arr['uid']), dbesc($lfile), @@ -961,7 +968,7 @@ function find_filename_by_hash($channel_id, $attachHash) { } /** - * + * * @param $in * @param $out */ @@ -1210,6 +1217,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny $ret = array(); $parent_arr = array(); + $count_values = array(); $poster = get_app()->get_observer(); //turn allow_gid into allow_cid's @@ -1317,11 +1325,10 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny return $ret; } - /** - * @brief Returns members of a group + * @brief Returns members of a group. * - * @param $group_id + * @param int $group_id id of the group to look up */ function in_group($group_id) { $group_members = array(); -- cgit v1.2.3 From fc1c188a7e1047d3c9f9007036161fb968e9c3c3 Mon Sep 17 00:00:00 2001 From: Razlo Date: Sun, 17 May 2015 02:40:51 +0200 Subject: updated the templates to the {{}}, compared to --- view/ca/lostpass_eml.tpl | 12 ++++++------ view/ca/passchanged_eml.tpl | 10 +++++----- view/ca/register_open_eml.tpl | 12 ++++++------ view/ca/register_verify_eml.tpl | 12 ++++++------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl index eccf2050a..469c429da 100644 --- a/view/ca/lostpass_eml.tpl +++ b/view/ca/lostpass_eml.tpl @@ -1,7 +1,7 @@ -Apreciat/da $username, +Apreciat/da {{$username}}, - S'ha rebut una sol·licitud en $sitename recentment per restablir + S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador. @@ -13,7 +13,7 @@ va emetre aquesta sol·licitud. Segueix aquest enllaç per verificar la teva identitat: -$reset_link +{{$reset_link}} A continuació rebràs un missatge amb la nova contrasenya. @@ -23,13 +23,13 @@ configuració. Les dades d'accés són els següents: -Lloc: $siteurl -Nom: $email +Lloc: {{$siteurl}} +Nom: {{$email}} Salutacions, - L'administració de $sitename + L'administració de {{$sitename}} diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl index 22e54b8c0..f0d62d9a1 100644 --- a/view/ca/passchanged_eml.tpl +++ b/view/ca/passchanged_eml.tpl @@ -1,5 +1,5 @@ -Apreciat/da $username, +Apreciat/da {{$username}}, La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació (o canvía immediatament la contrasenya amb quelcom que recordis). @@ -7,13 +7,13 @@ Apreciat/da $username, Les teves dades d'accés son les següents: -Lloc: $siteurl -Nom: $email -Contrasenya: $new_password +Lloc: {{$siteurl}} +Nom: {{$email}} +Contrasenya: {{$new_password}} Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil. - $sitename + {{$sitename}} diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl index 0170c98e3..7da9a2b88 100644 --- a/view/ca/register_open_eml.tpl +++ b/view/ca/register_open_eml.tpl @@ -1,15 +1,15 @@ -Apreciat/da $username, +Apreciat/da {{$username}}, - Gràcies per registrar-te en $sitename. El teu compte ha estat creat. + Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat. Les dades d'accés són les següents: -Lloc: $siteurl -Nom: $email -Contrasenya: $password +Lloc: {{$siteurl}} +Nom: {{$email}} +Contrasenya: {{$password}} Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració". @@ -17,6 +17,6 @@ Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuraci Pren un moment per revisar les altres configuracions del compte en aquesta pàgina. -Gràcies i benvingut/da $sitename. +Gràcies i benvingut/da {{$sitename}}. diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl index 3dd966e0a..651e8eff7 100644 --- a/view/ca/register_verify_eml.tpl +++ b/view/ca/register_verify_eml.tpl @@ -1,21 +1,21 @@ S'ha rebut la sol·licitud de registre d'un nou usuari en -$sitename que requereix la teva aprovació. +{{$sitename}} que requereix la teva aprovació. Les dades d'accés són els següents: -Nom Complet: $username -Lloc: $siteurl -Nom: $email +Nom Complet: {{$username}} +Lloc: {{$siteurl}} +Nom: {{$email}} Per aprovar aquesta sol·licitud, visita el següent enllaç: -$siteurl/regmod/allow/$hash +{{$siteurl}}/regmod/allow/{{$hash}} Per denegar la sol·licitud i eliminar el compte, per favor visita: -$siteurl/regmod/deny/$hash +{{$siteurl}}/regmod/deny/{{$hash}} Gràcies. -- cgit v1.2.3 From 91d7b0f7eb7d3d7240b9ba12e2fbd71334b5a458 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 May 2015 16:28:16 -0700 Subject: more work isolating the projectname from core. --- include/bb2diaspora.php | 2 +- include/diaspora.php | 8 +- include/enotify.php | 4 +- mod/admin.php | 2 +- mod/cloud.php | 2 +- mod/dav.php | 2 +- mod/home.php | 2 +- mod/invite.php | 6 +- mod/like.php | 2 +- mod/mitem.php | 4 +- mod/p.php | 2 +- mod/pubsites.php | 2 +- mod/setup.php | 4 +- mod/siteinfo.php | 8 +- util/messages.po | 594 ++++++++++++++++++++++++------------------------ version.inc | 2 +- 16 files changed, 325 insertions(+), 321 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 118e78639..8129ab5e6 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -450,7 +450,7 @@ function format_event_diaspora($ev) { $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM - $o = t('Redmatrix event notification:') . "\n"; + $o = t('$Projectname event notification:') . "\n"; $o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) . '**' . "\n"; diff --git a/include/diaspora.php b/include/diaspora.php index e8a470178..43651166d 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -706,8 +706,8 @@ function diaspora_request($importer,$xml) { $cnv = random_string(); $mid = random_string(); - $msg = t('You have started sharing with a Redmatrix premium channel.'); - $msg .= t('Redmatrix premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r"; + $msg = t('You have started sharing with a $Projectname premium channel.'); + $msg .= t('$Projectname premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r"; $msg .= t('Please do not reply to this message, as this channel is not sharing with you and any reply will not be seen by the recipient.') . "\r"; $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C'); @@ -2458,7 +2458,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : t('$projectname')) )); } else { $tpl = get_markup_template('diaspora_post.tpl'); @@ -2469,7 +2469,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : t('projectname')) )); } diff --git a/include/enotify.php b/include/enotify.php index b5495dc7c..b1aae816b 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -55,8 +55,8 @@ function notification($params) { push_lang($recip['account_language']); // should probably have a channel language - $banner = t('Red Matrix Notification'); - $product = t('redmatrix'); // PLATFORM_NAME; + $banner = t('$Projectname Notification'); + $product = t('$projectname'); // PLATFORM_NAME; $siteurl = $a->get_baseurl(true); $thanks = t('Thank You,'); $sitename = get_config('system','sitename'); diff --git a/mod/admin.php b/mod/admin.php index fd2ba510b..7b6a8b723 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -230,7 +230,7 @@ function admin_page_summary(&$a) { $alertmsg = ''; // annoy admin about upcoming unsupported PHP version if (version_compare(PHP_VERSION, '5.4', '<')) { - $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of RedMatrix. You are strongly urged to upgrade to a current version.' + $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of $Projectname. You are strongly urged to upgrade to a current version.' . '
PHP 5.3 has reached its End of Life (EOL) in August 2014.' . ' A list about current PHP versions can be found here.'; } diff --git a/mod/cloud.php b/mod/cloud.php index b36e6c482..4b5d45f97 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -117,7 +117,7 @@ function cloud_init(&$a) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { - $auth->Authenticate($server, t('RedMatrix - Guests: Username: {your email address}, Password: +++')); + $auth->Authenticate($server, t('$Projectname - Guests: Username: {your email address}, Password: +++')); } catch (Exception $e) { logger('mod_cloud: auth exception' . $e->getMessage()); diff --git a/mod/dav.php b/mod/dav.php index f7f89b6da..2f811a7f0 100644 --- a/mod/dav.php +++ b/mod/dav.php @@ -118,7 +118,7 @@ function dav_init(&$a) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { - $auth->Authenticate($server, t('RedMatrix channel')); + $auth->Authenticate($server, t('$Projectname channel')); } catch (Exception $e) { logger('mod_cloud: auth exception' . $e->getMessage()); diff --git a/mod/home.php b/mod/home.php index 7bb138d2e..03133a217 100644 --- a/mod/home.php +++ b/mod/home.php @@ -50,7 +50,7 @@ function home_content(&$a, $update = 0, $load = false) { if(get_config('system','projecthome')) { $o .= file_get_contents('assets/home.html'); $a->page['template'] = 'full'; - $a->page['title'] = t('Red Matrix - "The Network"'); + $a->page['title'] = t('$Projectname'); return $o; } diff --git a/mod/invite.php b/mod/invite.php index e197278d1..1fdfbacc6 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -129,12 +129,12 @@ function invite_content(&$a) { '$invite' => t('Send invitations'), '$addr_text' => t('Enter email addresses, one per line:'), '$msg_text' => t('Your message:'), - '$default_message' => t('Please join my community on RedMatrix.') . "\r\n" . "\r\n" + '$default_message' => t('Please join my community on $Projectname.') . "\r\n" . "\r\n" . $linktxt . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: ') . $invite_code . "\r\n" . "\r\n" : '') - . t('1. Register at any RedMatrix location (they are all inter-connected)') + . t('1. Register at any $Projectname location (they are all inter-connected)') . "\r\n" . "\r\n" . z_root() . '/register' - . "\r\n" . "\r\n" . t('2. Enter my RedMatrix network address into the site searchbar.') + . "\r\n" . "\r\n" . t('2. Enter my $Projectname network address into the site searchbar.') . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit ') . z_root() . '/channel/' . $channel['channel_address'] . ')' . "\r\n" . "\r\n" . t('3. Click [Connect]') diff --git a/mod/like.php b/mod/like.php index d3b6f3ecf..e79ff5f48 100755 --- a/mod/like.php +++ b/mod/like.php @@ -18,7 +18,7 @@ function like_content(&$a) { if(! $observer) { $_SESSION['return_url'] = $a->query_string; $o .= t('This action is restricted to members.') . EOL; - $o .= t('Please login with your RedMatrix ID or register as a new RedMatrix member to continue.') . EOL; + $o .= t('Please login with your $Projectname ID or register as a new $Projectname member to continue.') . EOL; return $o; } } diff --git a/mod/mitem.php b/mod/mitem.php index b03280105..0961e15ff 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -160,7 +160,7 @@ function mitem_content(&$a) { '$aclselect' => populate_acl($perm_defaults,false), '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'), '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'), - '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''), + '$usezid' => array('usezid', t('Use magic-auth if available'), true, ''), '$newwin' => array('newwin', t('Open link in new window'), false,''), '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit and finish'), @@ -231,7 +231,7 @@ function mitem_content(&$a) { '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'), - '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), + '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''), '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit'), diff --git a/mod/p.php b/mod/p.php index 9d1c12dbc..924fd7eba 100644 --- a/mod/p.php +++ b/mod/p.php @@ -43,7 +43,7 @@ function p_init(&$a) { '$handle' => xmlify($myaddr), '$public' => 'true', '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : t('$projectname')) )); header('Content-type: text/xml'); diff --git a/mod/pubsites.php b/mod/pubsites.php index ff3854492..62990c70c 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -16,7 +16,7 @@ function pubsites_content(&$a) { $o .= '

' . t('Public Sites') . '

'; $o .= '
' . - t('The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details.') . '
' . EOL; + t('The listed sites allow public registration for the $Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details.') . '' . EOL; $ret = z_fetch_url($url); if($ret['success']) { diff --git a/mod/setup.php b/mod/setup.php index b885388be..eba28a9bc 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -163,7 +163,7 @@ function setup_content(&$a) { global $install_wizard_pass, $db; $o = ''; $wizard_status = ""; - $install_title = t('Red Matrix Server - Setup'); + $install_title = t('$Projectname Server - Setup'); @@ -287,7 +287,7 @@ function setup_content(&$a) { $o .= replace_macros($tpl, array( '$title' => $install_title, '$pass' => t('Database connection'), - '$info_01' => t('In order to install Red Matrix we need to know how to connect to your database.'), + '$info_01' => t('In order to install $Projectname we need to know how to connect to your database.'), '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), diff --git a/mod/siteinfo.php b/mod/siteinfo.php index b6753f1ab..904228f13 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -152,8 +152,8 @@ function siteinfo_content(&$a) { $donate .= file_get_contents('doc/site_donate.html'); $o = replace_macros(get_markup_template('siteinfo.tpl'), array( - '$title' => t('Red'), - '$description' => t('This is a hub of redmatrix - a global cooperative network of decentralized privacy enhanced websites.'), + '$title' => t('$Projectname'), + '$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'), '$version' => $version, '$tag_txt' => t('Tag: '), '$tag' => $tag, @@ -161,10 +161,10 @@ function siteinfo_content(&$a) { '$lastpoll' => get_poller_runtime(), '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), - '$visit' => t('Please visit redmatrix.me to learn more about the Red Matrix.'), + '$visit' => t('Please visit redmatrix.me to learn more about $Projectname.'), '$bug_text' => t('Bug reports and issues: please visit'), '$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues', - '$bug_link_text' => 'redmatrix issues', + '$bug_link_text' => '$projectname issues', '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'), '$donate' => $donate, '$adminlabel' => t('Site Administrators'), diff --git a/util/messages.po b/util/messages.po index b2d9f402c..a78233475 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-05-08.1026\n" +"Project-Id-Version: 2015-05-15.1033\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-08 00:03-0700\n" +"POT-Creation-Date: 2015-05-15 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -258,8 +258,8 @@ msgstr "" #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 #: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100 -#: ../../include/apps.php:254 ../../include/menu.php:43 -#: ../../mod/settings.php:644 ../../mod/webpages.php:179 +#: ../../include/apps.php:254 ../../include/menu.php:61 +#: ../../mod/settings.php:649 ../../mod/webpages.php:180 #: ../../mod/thing.php:227 ../../mod/connections.php:382 #: ../../mod/connections.php:395 ../../mod/connections.php:414 #: ../../mod/blocks.php:152 ../../mod/editlayout.php:139 @@ -269,24 +269,24 @@ msgstr "" msgid "Edit" msgstr "" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185 +#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186 #: ../../mod/blocks.php:158 ../../mod/layouts.php:187 msgid "View" msgstr "" #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 -#: ../../include/conversation.php:1155 ../../mod/webpages.php:186 +#: ../../include/conversation.php:1155 ../../mod/webpages.php:187 #: ../../mod/events.php:653 ../../mod/photos.php:970 #: ../../mod/editwebpage.php:214 ../../mod/editpost.php:149 #: ../../mod/editblock.php:176 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:188 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:189 msgid "Page Link" msgstr "" @@ -294,12 +294,12 @@ msgstr "" msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:191 #: ../../mod/blocks.php:149 ../../mod/layouts.php:180 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:192 #: ../../mod/blocks.php:150 ../../mod/layouts.php:181 msgid "Edited" msgstr "" @@ -441,10 +441,10 @@ msgid "Describe (optional)" msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 -#: ../../mod/settings.php:582 ../../mod/settings.php:684 -#: ../../mod/settings.php:710 ../../mod/settings.php:738 -#: ../../mod/settings.php:761 ../../mod/settings.php:843 -#: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93 +#: ../../mod/settings.php:587 ../../mod/settings.php:689 +#: ../../mod/settings.php:715 ../../mod/settings.php:743 +#: ../../mod/settings.php:766 ../../mod/settings.php:848 +#: ../../mod/settings.php:1044 ../../mod/xchan.php:11 ../../mod/connect.php:93 #: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656 #: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358 #: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929 @@ -453,9 +453,9 @@ msgstr "" #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 -#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/mitem.php:229 -#: ../../mod/admin.php:446 ../../mod/admin.php:810 ../../mod/admin.php:946 -#: ../../mod/admin.php:1077 ../../mod/admin.php:1271 ../../mod/admin.php:1356 +#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/admin.php:446 +#: ../../mod/admin.php:810 ../../mod/admin.php:946 ../../mod/admin.php:1077 +#: ../../mod/admin.php:1271 ../../mod/admin.php:1356 ../../mod/mitem.php:237 #: ../../mod/mood.php:134 ../../mod/connedit.php:679 ../../mod/mail.php:355 #: ../../mod/appman.php:99 ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 #: ../../view/theme/apw/php/config.php:256 @@ -604,7 +604,7 @@ msgid "Shared" msgstr "" #: ../../include/RedDAV/RedBrowser.php:256 -#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:178 +#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:179 #: ../../mod/blocks.php:151 ../../mod/menu.php:104 ../../mod/layouts.php:174 #: ../../mod/new_channel.php:121 msgid "Create" @@ -616,8 +616,8 @@ msgstr "" msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584 -#: ../../mod/settings.php:610 ../../mod/admin.php:953 +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589 +#: ../../mod/settings.php:615 ../../mod/admin.php:953 #: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "" @@ -636,7 +636,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 #: ../../include/conversation.php:660 ../../include/apps.php:255 -#: ../../mod/settings.php:645 ../../mod/webpages.php:181 +#: ../../mod/settings.php:650 ../../mod/webpages.php:182 #: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:154 #: ../../mod/photos.php:1050 ../../mod/editlayout.php:107 #: ../../mod/editwebpage.php:225 ../../mod/admin.php:817 @@ -658,7 +658,7 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/network.php:632 +#: ../../include/network.php:635 msgid "view full size" msgstr "" @@ -1004,9 +1004,9 @@ msgstr "" #: ../../include/widgets.php:429 ../../include/identity.php:394 #: ../../include/identity.php:395 ../../include/identity.php:402 -#: ../../include/profile_selectors.php:80 ../../mod/settings.php:339 -#: ../../mod/settings.php:343 ../../mod/settings.php:344 -#: ../../mod/settings.php:347 ../../mod/settings.php:358 +#: ../../include/profile_selectors.php:80 ../../mod/settings.php:344 +#: ../../mod/settings.php:348 ../../mod/settings.php:349 +#: ../../mod/settings.php:352 ../../mod/settings.php:363 #: ../../mod/connedit.php:574 msgid "Friends" msgstr "" @@ -2096,7 +2096,7 @@ msgid "Your bookmarks" msgstr "" #: ../../include/nav.php:113 ../../include/conversation.php:1645 -#: ../../include/apps.php:136 ../../mod/webpages.php:176 +#: ../../include/apps.php:136 ../../mod/webpages.php:177 msgid "Webpages" msgstr "" @@ -2394,7 +2394,7 @@ msgstr "" #: ../../include/attach.php:611 ../../include/chat.php:131 #: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/achievements.php:30 ../../mod/manage.php:6 -#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31 +#: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31 #: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256 #: ../../mod/thing.php:290 ../../mod/profile_photo.php:264 #: ../../mod/profile_photo.php:277 ../../mod/block.php:22 @@ -2412,17 +2412,17 @@ msgstr "" #: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88 #: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78 #: ../../mod/poke.php:128 ../../mod/profiles.php:188 -#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/mitem.php:115 +#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206 #: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/layouts.php:69 #: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71 -#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:331 -#: ../../mod/mail.php:114 ../../mod/notifications.php:66 -#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68 -#: ../../mod/new_channel.php:99 ../../mod/appman.php:66 -#: ../../mod/network.php:12 ../../mod/page.php:28 ../../mod/page.php:79 -#: ../../mod/bookmarks.php:46 ../../mod/channel.php:100 +#: ../../mod/message.php:16 ../../mod/mitem.php:115 ../../mod/mood.php:111 +#: ../../mod/connedit.php:331 ../../mod/mail.php:114 +#: ../../mod/notifications.php:66 ../../mod/regmod.php:17 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28 +#: ../../mod/page.php:82 ../../mod/bookmarks.php:46 ../../mod/channel.php:100 #: ../../mod/channel.php:219 ../../mod/channel.php:262 #: ../../mod/suggest.php:26 ../../mod/service_limits.php:7 #: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393 @@ -2796,7 +2796,7 @@ msgstr "" msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1174 ../../mod/webpages.php:180 +#: ../../include/conversation.php:1174 ../../mod/webpages.php:181 #: ../../mod/blocks.php:153 ../../mod/photos.php:949 ../../mod/layouts.php:183 msgid "Share" msgstr "" @@ -2923,8 +2923,8 @@ msgstr "" msgid "OK" msgstr "" -#: ../../include/conversation.php:1239 ../../mod/settings.php:583 -#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +#: ../../include/conversation.php:1239 ../../mod/settings.php:588 +#: ../../mod/settings.php:614 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 #: ../../mod/events.php:636 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160 msgid "Cancel" @@ -3428,7 +3428,7 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/identity.php:1115 ../../mod/settings.php:1045 +#: ../../include/identity.php:1115 ../../mod/settings.php:1050 msgid "Full Name:" msgstr "" @@ -3815,7 +3815,7 @@ msgid "Profile Photo" msgstr "" #: ../../include/apps.php:247 ../../mod/settings.php:84 -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:613 msgid "Update" msgstr "" @@ -3914,43 +3914,43 @@ msgstr "" msgid "Key and Secret are required" msgstr "" -#: ../../mod/settings.php:124 +#: ../../mod/settings.php:129 msgid "Diaspora Policy Settings updated." msgstr "" -#: ../../mod/settings.php:232 +#: ../../mod/settings.php:237 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:236 +#: ../../mod/settings.php:241 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:250 +#: ../../mod/settings.php:255 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:252 +#: ../../mod/settings.php:257 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:266 +#: ../../mod/settings.php:271 msgid "Not valid email." msgstr "" -#: ../../mod/settings.php:269 +#: ../../mod/settings.php:274 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/settings.php:278 +#: ../../mod/settings.php:283 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:517 +#: ../../mod/settings.php:522 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/photos.php:556 +#: ../../mod/settings.php:578 ../../mod/api.php:106 ../../mod/photos.php:556 #: ../../mod/menu.php:88 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/admin.php:424 #: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 @@ -3958,7 +3958,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/photos.php:556 +#: ../../mod/settings.php:578 ../../mod/api.php:105 ../../mod/photos.php:556 #: ../../mod/menu.php:88 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/admin.php:426 #: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 @@ -3966,536 +3966,536 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../mod/settings.php:581 ../../mod/settings.php:607 -#: ../../mod/settings.php:643 +#: ../../mod/settings.php:586 ../../mod/settings.php:612 +#: ../../mod/settings.php:648 msgid "Add application" msgstr "" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:589 msgid "Name of application" msgstr "" -#: ../../mod/settings.php:585 ../../mod/settings.php:611 +#: ../../mod/settings.php:590 ../../mod/settings.php:616 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:585 ../../mod/settings.php:586 +#: ../../mod/settings.php:590 ../../mod/settings.php:591 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/settings.php:586 ../../mod/settings.php:612 +#: ../../mod/settings.php:591 ../../mod/settings.php:617 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:587 ../../mod/settings.php:613 +#: ../../mod/settings.php:592 ../../mod/settings.php:618 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:587 +#: ../../mod/settings.php:592 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/settings.php:588 ../../mod/settings.php:614 +#: ../../mod/settings.php:593 ../../mod/settings.php:619 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:588 +#: ../../mod/settings.php:593 msgid "Optional" msgstr "" -#: ../../mod/settings.php:599 +#: ../../mod/settings.php:604 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:642 +#: ../../mod/settings.php:647 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:646 +#: ../../mod/settings.php:651 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:647 +#: ../../mod/settings.php:652 msgid "No name" msgstr "" -#: ../../mod/settings.php:648 +#: ../../mod/settings.php:653 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:662 +#: ../../mod/settings.php:667 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:678 +#: ../../mod/settings.php:683 msgid "Feature/Addon Settings" msgstr "" -#: ../../mod/settings.php:680 +#: ../../mod/settings.php:685 msgid "Settings for the built-in Diaspora emulator" msgstr "" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:686 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:687 msgid "Diaspora Policy Settings" msgstr "" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:688 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../mod/settings.php:707 +#: ../../mod/settings.php:712 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:708 +#: ../../mod/settings.php:713 msgid "Enter New Password:" msgstr "" -#: ../../mod/settings.php:709 +#: ../../mod/settings.php:714 msgid "Confirm New Password:" msgstr "" -#: ../../mod/settings.php:709 +#: ../../mod/settings.php:714 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:711 ../../mod/settings.php:1046 +#: ../../mod/settings.php:716 ../../mod/settings.php:1051 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:712 ../../mod/removeaccount.php:61 +#: ../../mod/settings.php:717 ../../mod/removeaccount.php:61 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:713 +#: ../../mod/settings.php:718 msgid "Remove this account including all its channels" msgstr "" -#: ../../mod/settings.php:729 +#: ../../mod/settings.php:734 msgid "Off" msgstr "" -#: ../../mod/settings.php:729 +#: ../../mod/settings.php:734 msgid "On" msgstr "" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:741 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:765 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:799 +#: ../../mod/settings.php:804 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:802 +#: ../../mod/settings.php:807 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../mod/settings.php:805 ../../mod/admin.php:396 +#: ../../mod/settings.php:810 ../../mod/admin.php:396 msgid "mobile" msgstr "" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:846 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:852 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:853 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:854 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:855 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:855 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:851 +#: ../../mod/settings.php:856 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:851 +#: ../../mod/settings.php:856 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:852 +#: ../../mod/settings.php:857 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:858 msgid "Link post titles to source" msgstr "" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:859 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:862 msgid "Use blog/list mode on channel page" msgstr "" -#: ../../mod/settings.php:857 ../../mod/settings.php:858 +#: ../../mod/settings.php:862 ../../mod/settings.php:863 msgid "(comments displayed separately)" msgstr "" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:863 msgid "Use blog/list mode on matrix page" msgstr "" -#: ../../mod/settings.php:859 +#: ../../mod/settings.php:864 msgid "Channel page max height of content (in pixels)" msgstr "" -#: ../../mod/settings.php:859 ../../mod/settings.php:860 +#: ../../mod/settings.php:864 ../../mod/settings.php:865 msgid "click to expand content exceeding this height" msgstr "" -#: ../../mod/settings.php:860 +#: ../../mod/settings.php:865 msgid "Matrix page max height of content (in pixels)" msgstr "" -#: ../../mod/settings.php:894 +#: ../../mod/settings.php:899 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:895 +#: ../../mod/settings.php:900 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:896 +#: ../../mod/settings.php:901 msgid "Approved connections" msgstr "" -#: ../../mod/settings.php:897 +#: ../../mod/settings.php:902 msgid "Any connections" msgstr "" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:903 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:899 +#: ../../mod/settings.php:904 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:900 +#: ../../mod/settings.php:905 msgid "Anybody authenticated" msgstr "" -#: ../../mod/settings.php:901 +#: ../../mod/settings.php:906 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:980 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:985 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:984 ../../mod/profile_photo.php:366 +#: ../../mod/settings.php:989 ../../mod/profile_photo.php:366 msgid "or" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:994 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1042 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1044 +#: ../../mod/settings.php:1049 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1047 +#: ../../mod/settings.php:1052 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1048 +#: ../../mod/settings.php:1053 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1048 +#: ../../mod/settings.php:1053 msgid "Geographical location to display on your posts" msgstr "" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1054 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1056 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1056 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../mod/settings.php:1053 +#: ../../mod/settings.php:1058 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1055 +#: ../../mod/settings.php:1060 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1062 msgid "Hide my online presence" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1062 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../mod/settings.php:1059 +#: ../../mod/settings.php:1064 msgid "Simple Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1065 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1066 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1067 msgid "Private - default private, never open or public" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1068 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1070 msgid "Allow others to tag your posts" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1070 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1072 msgid "Advanced Privacy Settings" msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1074 msgid "Expire other channel content after this many days" msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1074 msgid "0 or blank prevents expiration" msgstr "" -#: ../../mod/settings.php:1070 +#: ../../mod/settings.php:1075 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1070 +#: ../../mod/settings.php:1075 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1071 +#: ../../mod/settings.php:1076 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1072 ../../mod/mitem.php:152 ../../mod/mitem.php:221 +#: ../../mod/settings.php:1077 ../../mod/mitem.php:159 ../../mod/mitem.php:229 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1076 +#: ../../mod/settings.php:1081 msgid "Channel permissions category:" msgstr "" -#: ../../mod/settings.php:1082 +#: ../../mod/settings.php:1087 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1082 +#: ../../mod/settings.php:1087 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1085 +#: ../../mod/settings.php:1090 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1086 +#: ../../mod/settings.php:1091 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1087 +#: ../../mod/settings.php:1092 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1088 +#: ../../mod/settings.php:1093 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1089 +#: ../../mod/settings.php:1094 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1090 +#: ../../mod/settings.php:1095 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1091 +#: ../../mod/settings.php:1096 msgid "You receive a connection request" msgstr "" -#: ../../mod/settings.php:1092 +#: ../../mod/settings.php:1097 msgid "Your connections are confirmed" msgstr "" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1098 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1094 +#: ../../mod/settings.php:1099 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1095 +#: ../../mod/settings.php:1100 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1096 +#: ../../mod/settings.php:1101 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1097 +#: ../../mod/settings.php:1102 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1098 +#: ../../mod/settings.php:1103 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1101 +#: ../../mod/settings.php:1106 msgid "Show visual notifications including:" msgstr "" -#: ../../mod/settings.php:1103 +#: ../../mod/settings.php:1108 msgid "Unseen matrix activity" msgstr "" -#: ../../mod/settings.php:1104 +#: ../../mod/settings.php:1109 msgid "Unseen channel activity" msgstr "" -#: ../../mod/settings.php:1105 +#: ../../mod/settings.php:1110 msgid "Unseen private messages" msgstr "" -#: ../../mod/settings.php:1105 ../../mod/settings.php:1110 -#: ../../mod/settings.php:1111 ../../mod/settings.php:1112 +#: ../../mod/settings.php:1110 ../../mod/settings.php:1115 +#: ../../mod/settings.php:1116 ../../mod/settings.php:1117 msgid "Recommended" msgstr "" -#: ../../mod/settings.php:1106 +#: ../../mod/settings.php:1111 msgid "Upcoming events" msgstr "" -#: ../../mod/settings.php:1107 +#: ../../mod/settings.php:1112 msgid "Events today" msgstr "" -#: ../../mod/settings.php:1108 +#: ../../mod/settings.php:1113 msgid "Upcoming birthdays" msgstr "" -#: ../../mod/settings.php:1108 +#: ../../mod/settings.php:1113 msgid "Not available in all themes" msgstr "" -#: ../../mod/settings.php:1109 +#: ../../mod/settings.php:1114 msgid "System (personal) notifications" msgstr "" -#: ../../mod/settings.php:1110 +#: ../../mod/settings.php:1115 msgid "System info messages" msgstr "" -#: ../../mod/settings.php:1111 +#: ../../mod/settings.php:1116 msgid "System critical alerts" msgstr "" -#: ../../mod/settings.php:1112 +#: ../../mod/settings.php:1117 msgid "New connections" msgstr "" -#: ../../mod/settings.php:1113 +#: ../../mod/settings.php:1118 msgid "System Registrations" msgstr "" -#: ../../mod/settings.php:1114 +#: ../../mod/settings.php:1119 msgid "" "Also show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../mod/settings.php:1116 +#: ../../mod/settings.php:1121 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../mod/settings.php:1116 +#: ../../mod/settings.php:1121 msgid "Must be greater than 0" msgstr "" -#: ../../mod/settings.php:1118 +#: ../../mod/settings.php:1123 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1119 +#: ../../mod/settings.php:1124 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/settings.php:1122 +#: ../../mod/settings.php:1127 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "" -#: ../../mod/settings.php:1123 +#: ../../mod/settings.php:1128 msgid "Miscellaneous Settings" msgstr "" -#: ../../mod/settings.php:1125 +#: ../../mod/settings.php:1130 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../mod/settings.php:1126 ../../mod/removeme.php:61 +#: ../../mod/settings.php:1131 ../../mod/removeme.php:61 msgid "Remove Channel" msgstr "" -#: ../../mod/settings.php:1127 +#: ../../mod/settings.php:1132 msgid "Remove this channel." msgstr "" @@ -4529,7 +4529,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/webpages.php:189 +#: ../../mod/webpages.php:190 msgid "Page Title" msgstr "" @@ -4657,7 +4657,7 @@ msgstr "" msgid "Item not available." msgstr "" -#: ../../mod/probe.php:23 ../../mod/probe.php:29 +#: ../../mod/probe.php:24 ../../mod/probe.php:30 #, php-format msgid "Fetching URL returns error: %1$s" msgstr "" @@ -4747,12 +4747,12 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:45 +#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49 msgid "Channel not found." msgstr "" #: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 -#: ../../mod/page.php:82 ../../index.php:241 +#: ../../mod/page.php:85 ../../index.php:241 msgid "Page not found." msgstr "" @@ -6766,114 +6766,6 @@ msgstr "" msgid "Source of Item" msgstr "" -#: ../../mod/mitem.php:51 -msgid "Unable to create element." -msgstr "" - -#: ../../mod/mitem.php:74 -msgid "Unable to update menu element." -msgstr "" - -#: ../../mod/mitem.php:89 -msgid "Unable to add menu element." -msgstr "" - -#: ../../mod/mitem.php:151 ../../mod/mitem.php:220 -msgid "Menu Item Permissions" -msgstr "" - -#: ../../mod/mitem.php:154 ../../mod/mitem.php:168 -msgid "Link Name" -msgstr "" - -#: ../../mod/mitem.php:155 ../../mod/mitem.php:169 -msgid "Link Target" -msgstr "" - -#: ../../mod/mitem.php:156 ../../mod/mitem.php:226 -msgid "Use RedMatrix magic-auth if available" -msgstr "" - -#: ../../mod/mitem.php:157 ../../mod/mitem.php:227 -msgid "Open link in new window" -msgstr "" - -#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 -msgid "Order in list" -msgstr "" - -#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 -msgid "Higher numbers will sink to bottom of listing" -msgstr "" - -#: ../../mod/mitem.php:159 -msgid "Submit and finish" -msgstr "" - -#: ../../mod/mitem.php:160 -msgid "Submit and continue" -msgstr "" - -#: ../../mod/mitem.php:166 -msgid "Menu:" -msgstr "" - -#: ../../mod/mitem.php:172 -msgid "Edit menu" -msgstr "" - -#: ../../mod/mitem.php:175 -msgid "Edit element" -msgstr "" - -#: ../../mod/mitem.php:176 -msgid "Drop element" -msgstr "" - -#: ../../mod/mitem.php:177 -msgid "New element" -msgstr "" - -#: ../../mod/mitem.php:178 -msgid "Edit this menu container" -msgstr "" - -#: ../../mod/mitem.php:179 -msgid "Add menu element" -msgstr "" - -#: ../../mod/mitem.php:180 -msgid "Delete this menu item" -msgstr "" - -#: ../../mod/mitem.php:181 -msgid "Edit this menu item" -msgstr "" - -#: ../../mod/mitem.php:198 -msgid "Menu item not found." -msgstr "" - -#: ../../mod/mitem.php:209 -msgid "Menu item deleted." -msgstr "" - -#: ../../mod/mitem.php:211 -msgid "Menu item could not be deleted." -msgstr "" - -#: ../../mod/mitem.php:218 -msgid "Edit Menu Element" -msgstr "" - -#: ../../mod/mitem.php:224 -msgid "Link text" -msgstr "" - -#: ../../mod/mitem.php:225 -msgid "URL of link" -msgstr "" - #: ../../mod/openid.php:26 msgid "OpenID protocol error. No ID returned." msgstr "" @@ -7979,6 +7871,118 @@ msgstr "" msgid "D, d M Y - g:i A" msgstr "" +#: ../../mod/mitem.php:51 +msgid "Unable to create element." +msgstr "" + +#: ../../mod/mitem.php:74 +msgid "Unable to update menu element." +msgstr "" + +#: ../../mod/mitem.php:89 +msgid "Unable to add menu element." +msgstr "" + +#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 +msgid "Menu Item Permissions" +msgstr "" + +#: ../../mod/mitem.php:161 ../../mod/mitem.php:176 +msgid "Link Name" +msgstr "" + +#: ../../mod/mitem.php:162 ../../mod/mitem.php:233 +msgid "Link or Submenu Target" +msgstr "" + +#: ../../mod/mitem.php:162 +msgid "Enter URL of the link or select a menu name to create a submenu" +msgstr "" + +#: ../../mod/mitem.php:163 ../../mod/mitem.php:234 +msgid "Use RedMatrix magic-auth if available" +msgstr "" + +#: ../../mod/mitem.php:164 ../../mod/mitem.php:235 +msgid "Open link in new window" +msgstr "" + +#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 +msgid "Order in list" +msgstr "" + +#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 +msgid "Higher numbers will sink to bottom of listing" +msgstr "" + +#: ../../mod/mitem.php:166 +msgid "Submit and finish" +msgstr "" + +#: ../../mod/mitem.php:167 +msgid "Submit and continue" +msgstr "" + +#: ../../mod/mitem.php:174 +msgid "Menu:" +msgstr "" + +#: ../../mod/mitem.php:177 +msgid "Link Target" +msgstr "" + +#: ../../mod/mitem.php:180 +msgid "Edit menu" +msgstr "" + +#: ../../mod/mitem.php:183 +msgid "Edit element" +msgstr "" + +#: ../../mod/mitem.php:184 +msgid "Drop element" +msgstr "" + +#: ../../mod/mitem.php:185 +msgid "New element" +msgstr "" + +#: ../../mod/mitem.php:186 +msgid "Edit this menu container" +msgstr "" + +#: ../../mod/mitem.php:187 +msgid "Add menu element" +msgstr "" + +#: ../../mod/mitem.php:188 +msgid "Delete this menu item" +msgstr "" + +#: ../../mod/mitem.php:189 +msgid "Edit this menu item" +msgstr "" + +#: ../../mod/mitem.php:206 +msgid "Menu item not found." +msgstr "" + +#: ../../mod/mitem.php:217 +msgid "Menu item deleted." +msgstr "" + +#: ../../mod/mitem.php:219 +msgid "Menu item could not be deleted." +msgstr "" + +#: ../../mod/mitem.php:226 +msgid "Edit Menu Element" +msgstr "" + +#: ../../mod/mitem.php:232 +msgid "Link text" +msgstr "" + #: ../../mod/mood.php:131 msgid "Set your current mood and tell your friends" msgstr "" @@ -8572,7 +8576,7 @@ msgstr "" msgid "Invalid connection." msgstr "" -#: ../../mod/page.php:119 +#: ../../mod/page.php:122 msgid "Ipsum Lorem" msgstr "" diff --git a/version.inc b/version.inc index b4af2b2ab..75841c2b0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-14.1032 +2015-05-17.1035 -- cgit v1.2.3 From 9a67ec8bd4242a3e025da44364f44bf24b2c5c54 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 May 2015 16:33:43 -0700 Subject: new string file - isolating the projectname from translated strings so that translation files will work across multiple projects. --- util/messages.po | 61 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/util/messages.po b/util/messages.po index a78233475..b76747b99 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-05-15.1033\n" +"Project-Id-Version: 2015-05-17.1035\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-15 00:03-0700\n" +"POT-Creation-Date: 2015-05-17 16:33-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1108,11 +1108,12 @@ msgid "Public Hubs" msgstr "" #: ../../include/enotify.php:58 -msgid "Red Matrix Notification" +msgid "$Projectname Notification" msgstr "" -#: ../../include/enotify.php:59 -msgid "redmatrix" +#: ../../include/enotify.php:59 ../../include/diaspora.php:2461 +#: ../../mod/p.php:46 +msgid "$projectname" msgstr "" #: ../../include/enotify.php:61 @@ -1675,7 +1676,7 @@ msgid "Attachments:" msgstr "" #: ../../include/bb2diaspora.php:453 -msgid "Redmatrix event notification:" +msgid "$Projectname event notification:" msgstr "" #: ../../include/text.php:329 @@ -3863,6 +3864,10 @@ msgstr "" msgid "Abstain" msgstr "" +#: ../../include/diaspora.php:2472 +msgid "projectname" +msgstr "" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "" @@ -4662,8 +4667,8 @@ msgstr "" msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../mod/home.php:53 -msgid "Red Matrix - "The Network"" +#: ../../mod/home.php:53 ../../mod/siteinfo.php:155 +msgid "$Projectname" msgstr "" #: ../../mod/home.php:124 @@ -4766,8 +4771,8 @@ msgstr "" #: ../../mod/like.php:21 msgid "" -"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." +"Please login with your $Projectname ID or register as a new $Projectname member to continue." msgstr "" #: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166 @@ -4933,11 +4938,11 @@ msgstr "" #: ../../mod/pubsites.php:19 msgid "" -"The listed sites allow public registration into the Red Matrix. All sites in " -"the matrix are interlinked so membership on any of them conveys membership " -"in the matrix as a whole. Some sites may require subscription or provide " -"tiered service plans. The provider links may provide " -"additional details." +"The listed sites allow public registration for the $Projectname network. All " +"sites in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some sites may require subscription or " +"provide tiered service plans. The provider links may " +"provide additional details." msgstr "" #: ../../mod/pubsites.php:25 @@ -4977,7 +4982,7 @@ msgid "Edit post" msgstr "" #: ../../mod/dav.php:121 -msgid "RedMatrix channel" +msgid "$Projectname channel" msgstr "" #: ../../mod/group.php:20 @@ -5041,14 +5046,10 @@ msgstr "" msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:155 -msgid "Red" -msgstr "" - #: ../../mod/siteinfo.php:156 msgid "" -"This is a hub of redmatrix - a global cooperative network of decentralized " -"privacy enhanced websites." +"This is a hub of $Projectname - a global cooperative network of " +"decentralized privacy enhanced websites." msgstr "" #: ../../mod/siteinfo.php:158 @@ -5066,7 +5067,7 @@ msgstr "" #: ../../mod/siteinfo.php:164 msgid "" "Please visit redmatrix.me to learn more " -"about the Red Matrix." +"about $Projectname." msgstr "" #: ../../mod/siteinfo.php:165 @@ -5091,7 +5092,7 @@ msgid "Not Found" msgstr "" #: ../../mod/setup.php:166 -msgid "Red Matrix Server - Setup" +msgid "$Projectname Server - Setup" msgstr "" #: ../../mod/setup.php:172 @@ -5136,7 +5137,7 @@ msgstr "" #: ../../mod/setup.php:290 msgid "" -"In order to install Red Matrix we need to know how to connect to your " +"In order to install $Projectname we need to know how to connect to your " "database." msgstr "" @@ -5596,7 +5597,7 @@ msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" #: ../../mod/cloud.php:120 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" #: ../../mod/photos.php:77 @@ -6157,7 +6158,7 @@ msgid "Your message:" msgstr "" #: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." +msgid "Please join my community on $Projectname." msgstr "" #: ../../mod/invite.php:134 @@ -6165,11 +6166,11 @@ msgid "You will need to supply this invitation code: " msgstr "" #: ../../mod/invite.php:135 -msgid "1. Register at any RedMatrix location (they are all inter-connected)" +msgid "1. Register at any $Projectname location (they are all inter-connected)" msgstr "" #: ../../mod/invite.php:137 -msgid "2. Enter my RedMatrix network address into the site searchbar." +msgid "2. Enter my $Projectname network address into the site searchbar." msgstr "" #: ../../mod/invite.php:138 @@ -7900,7 +7901,7 @@ msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" #: ../../mod/mitem.php:163 ../../mod/mitem.php:234 -msgid "Use RedMatrix magic-auth if available" +msgid "Use magic-auth if available" msgstr "" #: ../../mod/mitem.php:164 ../../mod/mitem.php:235 -- cgit v1.2.3 From dd72f580dd14e8745dd81bc056e1a73df1e8e563 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 May 2015 16:40:42 -0700 Subject: update readme --- README.md | 7 +++++-- doc/README.md | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f2c80fca6..b240bee36 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ -Hubzilla - Hub Deployment Platform -================================== +Hubzilla +======== + +###Websites. Redefined. + ![Hubzilla](images/ghash-32.png) diff --git a/doc/README.md b/doc/README.md index 9cd0cb27b..b240bee36 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,9 +1,11 @@ -Hubzilla - Hub Deployment Platform -================================== +Hubzilla +======== + +###Websites. Redefined. -![Hubzilla](images/ghash-32.png) +![Hubzilla](images/ghash-32.png) **What are Hubs?** @@ -34,4 +36,3 @@ Possible website applications include * forums * dating websites * pretty much anything you can do on a traditional blog or community website, but that you could do better if you could easily connect it with other websites or privately share things across website boundaries. - -- cgit v1.2.3 From 3b859aa9ef01d065b40943f5a5701f35217b89f3 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 May 2015 18:14:50 -0700 Subject: Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. --- boot.php | 10 ++++++ include/api.php | 5 ++- include/oauth.php | 11 +++--- include/permissions.php | 84 +++++++++++++++++++++++++++++++++++++++++++++ util/shredder/ShredOAuth.sh | 2 +- 5 files changed, 106 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 8dcc3b56b..ad75a2d25 100755 --- a/boot.php +++ b/boot.php @@ -651,6 +651,7 @@ class App { public $observer = null; // xchan record of the page observer public $profile_uid = 0; // If applicable, the channel_id of the "page owner" public $poi = null; // "person of interest", generally a referenced connection + private $oauth_key = null; // consumer_id of oauth request, if used public $layout = array(); // Comanche parsed template public $pdl = null; private $perms = null; // observer permissions @@ -934,6 +935,7 @@ class App { $this->observer = $xchan; } + function get_observer() { return $this->observer; } @@ -946,6 +948,14 @@ class App { return $this->perms; } + function set_oauth_key($consumer_id) { + $this->oauth_key = $consumer_id; + } + + function get_oauth_key() { + return $this->oauth_key; + } + function get_apps() { return $this->apps; } diff --git a/include/api.php b/include/api.php index 12247c183..788a84208 100644 --- a/include/api.php +++ b/include/api.php @@ -78,11 +78,14 @@ require_once('include/items.php'); // list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request()); if (!is_null($token)){ $oauth->loginUser($token->uid); + + $a->set_oauth_key($consumer->key); + call_hooks('logged_in', $a->user); return; } echo __file__.__line__.__function__."
"; 
-			var_dump($consumer, $token); 
+//			var_dump($consumer, $token); 
 			die();
 		}
 		catch(Exception $e) {
diff --git a/include/oauth.php b/include/oauth.php
index 8eb8a83d8..ec754db95 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -20,19 +20,21 @@ class FKOAuthDataStore extends OAuthDataStore {
 		logger(__function__.":".$consumer_key);
 //      echo "
"; var_dump($consumer_key); killme();
 
-		$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
+		$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id = '%s'",
 			dbesc($consumer_key)
 		);
 
-		if (count($r))
+		if($r) {
+			get_app()->set_oauth_key($consumer_key);
 			return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
+		}
 		return null;
   }
 
   function lookup_token($consumer, $token_type, $token) {
 		logger(__function__.":".$consumer.", ". $token_type.", ".$token);
 
-		$r = q("SELECT id, secret,scope, expires, uid  FROM tokens WHERE client_id='%s' AND scope='%s' AND id='%s'",
+		$r = q("SELECT id, secret, scope, expires, uid  FROM tokens WHERE client_id = '%s' AND scope = '%s' AND id = '%s'",
 			dbesc($consumer->key),
 			dbesc($token_type),
 			dbesc($token)
@@ -51,7 +53,7 @@ class FKOAuthDataStore extends OAuthDataStore {
   function lookup_nonce($consumer, $token, $nonce, $timestamp) {
 //		echo __file__.":".__line__."
"; var_dump($consumer,$key); killme();
 
-		$r = q("SELECT id, secret  FROM tokens WHERE client_id='%s' AND id='%s' AND expires=%d",
+		$r = q("SELECT id, secret FROM tokens WHERE client_id = '%s' AND id = '%s' AND expires = %d",
 			dbesc($consumer->key),
 			dbesc($nonce),
 			intval($timestamp)
@@ -132,6 +134,7 @@ class FKOAuthDataStore extends OAuthDataStore {
 }
 
 class FKOAuth1 extends OAuthServer {
+
 	function __construct() {
 		parent::__construct(new FKOAuthDataStore());
 		$this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT());
diff --git a/include/permissions.php b/include/permissions.php
index 68ff2b3d4..f63c6da18 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -65,6 +65,10 @@ function get_perms() {
  */
 function get_all_perms($uid, $observer_xchan, $internal_use = true) {
 
+	$api = get_app()->get_oauth_key();
+	if($api)
+		return get_all_api_perms($uid,$api);	
+
 	$global_perms = get_perms();
 
 	// Save lots of individual lookups
@@ -265,6 +269,10 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
  */
 function perm_is_allowed($uid, $observer_xchan, $permission) {
 
+	$api = get_app()->get_oauth_key();
+	if($api)
+		return api_perm_is_allowed($uid,$api,$permission);
+
 	$arr = array(
 		'channel_id'    => $uid,
 		'observer_hash' => $observer_xchan,
@@ -388,6 +396,82 @@ function perm_is_allowed($uid, $observer_xchan, $permission) {
 	return false;
 }
 
+function get_all_api_perms($uid,$api) {	
+
+	$global_perms = get_perms();
+
+	$ret = array();
+
+	$r = q("select * from xperm where xp_client = '%s' and xp_channel = %d",
+		dbesc($api),
+		intval($uid)
+	);
+
+	if(! $r)
+		return false;
+
+	$allow_all = false;
+	$allowed = array();
+	foreach($r as $rr) {
+		if($rr['xp_perm'] === 'all')
+			$allow_all = true;
+		if(! in_array($rr['xp_perm'],$allowed))
+			$allowed[] = $rr['xp_perm'];
+	}
+
+	foreach($global_perms as $perm_name => $permission) {
+		if($allow_all || in_array($perm_name,$allowed))
+			$ret[$perm_name] = true;
+		else
+			$ret[$perm_name] = false;
+
+	}
+
+	$arr = array(
+		'channel_id'    => $uid,
+		'observer_hash' => $observer_xchan,
+		'permissions'   => $ret);
+
+	call_hooks('get_all_api_perms',$arr);
+
+	return $arr['permissions'];
+
+}
+
+
+function api_perm_is_allowed($uid,$api,$permission) {
+
+	$arr = array(
+		'channel_id'    => $uid,
+		'observer_hash' => $observer_xchan,
+		'permission'    => $permission,
+		'result'        => false
+	);
+
+	call_hooks('api_perm_is_allowed', $arr);
+	if($arr['result'])
+		return true;
+
+	$r = q("select * from xperm where xp_client = '%s' and xp_channel = %d and ( xp_perm = 'all' OR xp_perm = '%s' )",
+		dbesc($api),
+		intval($uid),
+		dbesc($permission)
+	);
+
+	if(! $r)
+		return false;
+
+	foreach($r as $rr) {
+		if($rr['xp_perm'] === 'all' || $rr['xp_perm'] === $permission)
+			return true;
+
+	}
+
+	return false;
+
+}
+
+
 
 // Check a simple array of observers against a permissions
 // return a simple array of those with permission
diff --git a/util/shredder/ShredOAuth.sh b/util/shredder/ShredOAuth.sh
index 9828124c7..f39d6f7c4 100755
--- a/util/shredder/ShredOAuth.sh
+++ b/util/shredder/ShredOAuth.sh
@@ -128,7 +128,7 @@ FO_statuses_update () {
     $(OAuth_param 'status' "$2")
     )
   
-  params[${#params[@]}]=$(OAuth_param 'source' "shred")
+  params[${#params[@]}]=$(OAuth_param 'source' "shredder")
   
   [[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" )
     
-- 
cgit v1.2.3


From ac3b886cc46bd9c634cce7b409f5bea7211382da Mon Sep 17 00:00:00 2001
From: redmatrix 
Date: Sun, 17 May 2015 19:00:17 -0700
Subject: missing $

---
 include/diaspora.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 43651166d..9b2e4623a 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2469,7 +2469,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 			'$handle' => xmlify($myaddr),
 			'$public' => $public,
 			'$created' => $created,
-			'$provider' => (($item['app']) ? $item['app'] : t('projectname'))
+			'$provider' => (($item['app']) ? $item['app'] : t('$projectname'))
 		));
 	}
 
-- 
cgit v1.2.3