Merge pull request #631 from fabrixxm/addonlangs

Per addon translation

diff --git a/include/bbcode.php b/include/bbcode.php
index d9a1192d67bede8a2bb551020142b47115b61ed8..ebed0dbb255b60da06dd387f907de0c693193736 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -642,8 +642,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        $Text = preg_replace('/\&quot\;/','"',$Text);
 
        // fix any escaped ampersands that may have been converted into links
-       $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
-       $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
+       $Text = preg_replace("/\<([^>]*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
+       $Text = preg_replace("/\<([^>]*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
 
        if($saved_image)
                $Text = bb_replace_images($Text, $saved_image);

diff --git a/mod/admin.php b/mod/admin.php
index ecca0b8be3bf5cec455945d7ef98d2b4fcf7452f..48cc4b1510afc9c54e4e2741574a83c202473f03 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -256,7 +256,8 @@ function admin_page_site_post(&$a){
        $thread_allow           =       ((x($_POST,'thread_allow'))             ? True                                          : False);
        $newuser_private                =       ((x($_POST,'newuser_private'))          ? True                                          : False);
        $enotify_no_content             =       ((x($_POST,'enotify_no_content'))       ? True                                          : False);
-
+       $private_addons         =       ((x($_POST,'private_addons'))           ? True                                          : False);
+       
        $no_multi_reg           =       ((x($_POST,'no_multi_reg'))             ? True                                          : False);
        $no_openid              =       !((x($_POST,'no_openid'))               ? True                                          : False);
        $no_regfullname         =       !((x($_POST,'no_regfullname'))          ? True                                          : False);
@@ -283,7 +284,6 @@ function admin_page_site_post(&$a){
        $temppath               =       ((x($_POST,'temppath'))                 ? notags(trim($_POST['temppath']))              : '');
        $basepath               =       ((x($_POST,'basepath'))                 ? notags(trim($_POST['basepath']))              : '');
        $singleuser             =       ((x($_POST,'singleuser'))               ? notags(trim($_POST['singleuser']))            : '');
-
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
                        q("update `contact` set 
@@ -387,7 +387,8 @@ function admin_page_site_post(&$a){
        set_config('system','dfrn_only', $dfrn_only);
        set_config('system','ostatus_disabled', $ostatus_disabled);
        set_config('system','diaspora_enabled', $diaspora_enabled);
-
+       set_config('config','private_addons', $private_addons);
+       
        set_config('system','new_share', $new_share);
        set_config('system','hide_help', $hide_help);
        set_config('system','use_fulltext_engine', $use_fulltext_engine);
@@ -396,8 +397,7 @@ function admin_page_site_post(&$a){
        set_config('system','lockpath', $lockpath);
        set_config('system','temppath', $temppath);
        set_config('system','basepath', $basepath);
-
-
+       
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl(true) . '/admin/site' );
        return; // NOTREACHED
@@ -509,7 +509,8 @@ function admin_page_site(&$a) {
                '$thread_allow'         => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
                '$newuser_private'      => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
                '$enotify_no_content'   => array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
-
+               '$private_addons'       => array('private_addons', t("Disallow public access to addons listed in the apps menu."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
+               
                '$no_multi_reg'         => array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
                '$no_openid'            => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
                '$no_regfullname'       => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
@@ -532,7 +533,6 @@ function admin_page_site(&$a) {
                '$lockpath'             => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
                '$temppath'             => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
                '$basepath'             => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
-
         '$form_security_token' => get_form_security_token("admin_site"),
 
        ));

diff --git a/mod/apps.php b/mod/apps.php
index 8049b45fb3e846162b8a06ab41bfa2763b61b84a..a821ef5d5b89192b5534df7e8b78cd074e9a7964 100644 (file)
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -1,7 +1,14 @@
 <?php
 
 function apps_content(&$a) {
-       $title = t('Applications');
+    $privateaddons = get_config('config','private_addons');
+      if ($privateaddons === "1") {
+       if((! (local_user())))  {
+       info( t("You must be logged in to use addons. "));
+      return;};
+}
+
+      $title = t('Applications');
 
        if(count($a->apps)==0)
                notice( t('No installed applications.') . EOL);

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 20a0839fee2ab67ac7f0d84ee5ca33c645e84ea9..0d3d451b1c459e4ee89b2018020adb91d6709a6f 100644 (file)
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -85,7 +85,7 @@
        {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-       
+       {{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}    
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>

diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index c1442202d16911c5ca5ccd22b626332e188f9ca6..30678f1bf2ea2bfe0dfecc371db417af9aacd927 100644 (file)
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -90,7 +90,7 @@
        {{include file="field_checkbox.tpl" field=$thread_allow}}
        {{include file="field_checkbox.tpl" field=$newuser_private}}
        {{include file="field_checkbox.tpl" field=$enotify_no_content}}
-       
+       {{include file="field_checkbox.tpl" field=$private_addons}}     
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
        
        <h3>{{$advanced}}</h3>

diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
index e3fc14ac3bd9e703319cb89c2acdb13094f29c1b..80345b78bd6b98374790fedb27cc4b88f5dcc2c8 100644 (file)
--- a/view/smarty3/admin_users.tpl
+++ b/view/smarty3/admin_users.tpl
@@ -75,7 +75,7 @@
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
                                                <td class='lastitem_date'>{{$u.lastitem_date}}</td>
-                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}}</td>
+                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
                                                <td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

diff --git a/view/theme/smoothly/images/larrow.gif b/view/theme/smoothly/images/larrow.gif
new file mode 100644 (file)
index 0000000..15bb1ea
Binary files /dev/null and b/view/theme/smoothly/images/larrow.gif differ

diff --git a/view/theme/smoothly/images/rarrow.gif b/view/theme/smoothly/images/rarrow.gif
new file mode 100644 (file)
index 0000000..2237fc6
Binary files /dev/null and b/view/theme/smoothly/images/rarrow.gif differ

diff --git a/view/theme/smoothly/login.tpl b/view/theme/smoothly/login.tpl
index 281890f4236f5e1d1a0e76bf2936c5ffe9eea901..a2c143d39c22974d00b37fd24a6d667951179ee6 100644 (file)
--- a/view/theme/smoothly/login.tpl
+++ b/view/theme/smoothly/login.tpl
@@ -1,5 +1,4 @@
 <img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
-
 <div class="login-form">
 <form action="$dest_url" method="post" >
        <input type="hidden" name="auth-params" value="login" />
@@ -34,5 +33,4 @@
        
 </form>
 </div>
-
 <script type="text/javascript">window.loginName = "$lname.0";</script>

diff --git a/view/theme/smoothly/smarty3/login.tpl b/view/theme/smoothly/smarty3/login.tpl
index 0860f66f1e00f2407bc2b2b9473c424aa79e5e00..e8ade8250957a41d04a2f47c4aeb407fce541e84 100644 (file)
--- a/view/theme/smoothly/smarty3/login.tpl
+++ b/view/theme/smoothly/smarty3/login.tpl
@@ -4,7 +4,6 @@
  *
  *}}
 <img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
-
 <div class="login-form">
 <form action="{{$dest_url}}" method="post" >
        <input type="hidden" name="auth-params" value="login" />
@@ -39,5 +38,4 @@
        
 </form>
 </div>
-
 <script type="text/javascript">window.loginName = "{{$lname.0}}";</script>

diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/smarty3/wall_thread.tpl
index ae703a85606094d5f33ac1c8c7b1d2dbe19cf15f..f652de90b8c1aa6adc14ff81508f10e6232a7765 100644 (file)
--- a/view/theme/smoothly/smarty3/wall_thread.tpl
+++ b/view/theme/smoothly/smarty3/wall_thread.tpl
@@ -21,7 +21,7 @@
                                <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
                                <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
                        </div>
-                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
                        <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index cbce920e73d667a88779ac540cc1f9993bcb946f..285072d709f49cbe5b41bc1b68470f0f174ca4d1 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
        style.css
        Smoothly
    
-       Created by alex@friendica.pixelbits.de on 2013-02-21
+       Created by alex@friendica.pixelbits.de on 2013-02-27
 
 ** Colors ** 
 Blue links - #1873a2
@@ -634,8 +634,9 @@ aside h4 {
 
 .vcard #profile-photo-wrapper {
        margin: 10px 0px;
-       padding: 6px;
-       width: auto;
+       padding: 1px;
+       width: 200px;
+       height: 200px;
        background: none repeat scroll 0 0 #FFFFFF;
        border: 1px solid #C5C5C5;
        box-shadow: 0 0 8px #BDBDBD;
@@ -1403,10 +1404,18 @@ ul .sidebar-group-li .icon {
        width: 100px;
 }
 
+.wall-item-photo {
+       width: 81px !important; 
+       height: 81px !important;
+       border-radius: 5px;
+               -webkit-border-radius: 5px;
+               -moz-border-radius: 5px;
+}
+
 .wall-item-photo-wrapper { 
        width: 80px; 
        height: 80px;
-       padding: 4px;
+       padding: 1px;
        position: relative;
        border: 1px solid #dddddd;
        border-radius: 5px;
@@ -1589,14 +1598,13 @@ ul .sidebar-group-li .icon {
 }
 
 .wallwall .wwto {
-       left: -10px;
-       margin: 0;
+       left: 0px;
        position: absolute;
-       top: 65px;
-       width: 30px;
+       margin: -1px;
+       top: 63px;
        z-index: 900;
-       width: 30px;
-       height: 30px;    
+       width: 0px;
+       height: 0px;    
 }
 
 .wallwall .wwto img { 
@@ -1610,8 +1618,8 @@ ul .sidebar-group-li .icon {
 
 .wall-item-arrowphoto-wrapper {
        position: absolute;
-       left: 20px;
-       top: 70px;
+       left: 30px;
+       top: 67px;
        z-index: 950;
 }
 
@@ -1725,8 +1733,8 @@ code {
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo {
-       width: 40px!important;
-       height: 40px!important;
+       width: 41px!important;
+       height: 41px!important;
 }
 
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
@@ -2013,8 +2021,11 @@ div[id$="wrapper"] br {
 }
 
 .photo {
-       height: 191px!important;
-       width: 191px!important;
+       height: 200px!important;
+       width: 200px!important;
+       border-radius: 5px;
+               -moz-border-radius: 5px;
+               -webkit-border-radius: 5px;
 }
 
 #side-bar-photos-albums {

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index c88b2782740299c7b69ddeb4b118d116402a6ae6..849ad80a322893e30214d96a77b41717afba1e04 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 0.21
+ * Version: Version 2013-02-27.1
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>

diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
index 7987a36492c88121d973f19b39d8d81a87680d47..6d1e9477543903033370e38324bed4b9cca7f38d 100644 (file)
--- a/view/theme/smoothly/wall_thread.tpl
+++ b/view/theme/smoothly/wall_thread.tpl
@@ -16,7 +16,7 @@
                                <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
                                <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
                        </div>
-                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="$item.wall" /></div>
                        {{ endif }}
                        <div class="wall-item-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
                                onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"