Merge branch 'rewrites/app_get_baseurl_static' into develop

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php

diff --cc include/diaspora.php
Simple merge

diff --cc mod/crepair.php
index 2661deaeed9b0c8bb4b0ca99a5bc44ad4171d6b9,59b92df0a7d0d8c48a6f0acbaa2d8cb6894e0072..c141958e8b958778acddab4e78858f7f2fd5697d
--- 1/mod/crepair.php
--- 2/mod/crepair.php
+++ b/mod/crepair.php
@@@ -30,8 -30,7 +30,7 @@@ function crepair_init(App &$a) 
        }
  }
  
- 
 -function crepair_post(&$a) {
 +function crepair_post(App &$a) {
        if (! local_user()) {
                return;
        }

diff --cc mod/dfrn_confirm.php
Simple merge

diff --cc mod/install.php
index 80a4cb799e9cf8efd50106caacf2f231dca00e52,b13da8c28f8c86d1a6d9b40a0cd2275e7894553d..9adeac604e56ce57da290b6bc7431dbf4890cd76
--- 1/mod/install.php
--- 2/mod/install.php
+++ b/mod/install.php
@@@ -565,8 -565,7 +565,7 @@@ function check_imagik(&$checks) 
        }
  }
  
- 
 -function manual_config(&$a) {
 +function manual_config(App &$a) {
        $data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
        $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
        $o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";

diff --cc mod/network.php
index 6c9bf75799aa26132ac443b9545d2dad43473dbf,cce511ae19ff66238e2112280effd1274d892d11..f43327707671f27ff1847709cfb162fd2889393e
--- 1/mod/network.php
--- 2/mod/network.php
+++ b/mod/network.php
@@@ -6,12 -6,12 +6,13 @@@ function network_init(App &$a) 
        }
  
        $is_a_date_query = false;
--      if(x($_GET['cid']) && intval($_GET['cid']) != 0)
++      if (x($_GET['cid']) && intval($_GET['cid']) != 0) {
                $cid = $_GET['cid'];
++      }
  
--      if($a->argc > 1) {
--              for($x = 1; $x < $a->argc; $x ++) {
--                      if(is_a_date_arg($a->argv[$x])) {
++      if ($a->argc > 1) {
++              for ($x = 1; $x < $a->argc; $x ++) {
++                      if (is_a_date_arg($a->argv[$x])) {
                                $is_a_date_query = true;
                                break;
                        }
@@@ -26,7 -26,7 +27,7 @@@
  
  
        // fetch last used network view and redirect if needed
--      if(! $is_a_date_query) {
++      if (! $is_a_date_query) {
                $sel_tabs = network_query_get_sel_tab($a);
                $sel_nets = network_query_get_sel_net();
                $sel_groups = network_query_get_sel_group($a);

diff --cc mod/suggest.php
index 4c08db8b6cf9f6012f5293dc5a635bb8b199ce3c,0004128a1a0a54c9d3180b1508ec0586e484ddaf..6ded66286aaec5d69289a21572bce4e3bc2005f0
--- 1/mod/suggest.php
--- 2/mod/suggest.php
+++ b/mod/suggest.php
@@@ -16,8 -16,8 +16,8 @@@ function suggest_init(App &$a) 
                        // so add any arguments as hidden inputs
                        $query = explode_querystring($a->query_string);
                        $inputs = array();
--                      foreach($query['args'] as $arg) {
--                              if(strpos($arg, 'confirm=') === false) {
++                      foreach ($query['args'] as $arg) {
++                              if (strpos($arg, 'confirm=') === false) {
                                        $arg_parts = explode('=', $arg);
                                        $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
                                }

diff --cc mod/videos.php
index 00c7c6dfa1798654855dd5d803e3ee5b8b888a4c,dbfc044ea0efdb89ee526b25749bfe3b2f13eace..64838998f14173e97a148d7600b6b7064845ee23
--- 1/mod/videos.php
--- 2/mod/videos.php
+++ b/mod/videos.php
@@@ -167,8 -167,8 +167,9 @@@ function videos_post(App &$a) 
                                $url = App::get_baseurl();
                                $drop_id = intval($i[0]['id']);
  
--                              if($i[0]['visible'])
++                              if ($i[0]['visible']) {
                                        proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
++                              }
                        }
                }
  

diff --cc view/theme/duepuntozero/config.php
index 485e4c233e0a01a35858390a1361ccf2b9348c43,749a377fc66d3e650b04ca0c8506e127a42d6cfd..acea9947bf2baeb461034469f956f8113e5584a0
--- 1/view/theme/duepuntozero/config.php
--- 2/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@@ -4,8 -4,8 +4,7 @@@
   */
  
  
--
 -function theme_content(&$a){
 +function theme_content(App &$a){
        if (!local_user()) {
                return;
        }

diff --cc view/theme/quattro/config.php
index 1a5a9c02132938bb5839467b05735a8e2272c7ec,9a08adbaf9f99bf790c8388e2c3dd4ccf7843934..0c619569a0be97ad24c5ea7ae86e1052e8f9a3e5
--- 1/view/theme/quattro/config.php
--- 2/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@@ -3,9 -3,9 +3,7 @@@
   * Theme settings
   */
  
--
--
 -function theme_content(&$a){
 +function theme_content(App &$a){
        if (!local_user()) {
                return;
        }
@@@ -32,11 -32,11 +30,11 @@@ function theme_post(App &$a)
  }
  
  
 -function theme_admin(&$a){
 +function theme_admin(App &$a){
        $align = get_config('quattro', 'align' );
        $color = get_config('quattro', 'color' );
--    $tfs = get_config("quattro","tfs");
--    $pfs = get_config("quattro","pfs");    
++      $tfs = get_config("quattro","tfs");
++      $pfs = get_config("quattro","pfs");    
  
        return quattro_form($a,$align, $color, $tfs, $pfs);
  }
@@@ -45,31 -45,31 +43,35 @@@ function theme_admin_post(App &$a)
        if (isset($_POST['quattro-settings-submit'])){
                set_config('quattro', 'align', $_POST['quattro_align']);
                set_config('quattro', 'color', $_POST['quattro_color']);
--        set_config('quattro', 'tfs', $_POST['quattro_tfs']);
++              set_config('quattro', 'tfs', $_POST['quattro_tfs']);
                set_config('quattro', 'pfs', $_POST['quattro_pfs']);
        }
  }
  
  /// @TODO $a is no longer used here
--function quattro_form(&$a, $align, $color, $tfs, $pfs){
++function quattro_form(App &$a, $align, $color, $tfs, $pfs){
        $colors = array(
--              "dark"=>"Quattro", 
--              "lilac"=>"Lilac", 
--              "green"=>"Green"
++              "dark"  => "Quattro",
++              "lilac" => "Lilac",
++              "green" => "Green",
        );
--    
--    if ($tfs===false) $tfs="20";
--    if ($pfs===false) $pfs="12";
--    
++
++      if ($tfs === false) {
++              $tfs = "20";
++      }
++      if ($pfs === false) {
++              $pfs = "12";
++      }
++
        $t = get_markup_template("theme_settings.tpl" );
        $o .= replace_macros($t, array(
--              '$submit' => t('Submit'),
++              '$submit'  => t('Submit'),
                '$baseurl' => App::get_baseurl(),
--              '$title' => t("Theme settings"),
--              '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
--              '$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
--        '$pfs' => array('quattro_pfs', t('Posts font size'), $pfs),
--        '$tfs' => array('quattro_tfs',t('Textareas font size'), $tfs),
++              '$title'   => t("Theme settings"),
++              '$align'   => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
++              '$color'   => array('quattro_color', t('Color scheme'), $color, '', $colors),
++        '$pfs'     => array('quattro_pfs', t('Posts font size'), $pfs),
++        '$tfs'     => array('quattro_tfs',t('Textareas font size'), $tfs),
        ));
        return $o;
  }