Continued with cleanups:

- removed some empty lines at bottom of files
- added new-line character at end of file (as this else may confuse some old
  editors)
- moved JavaScript files out of "include" into own "js"
- if you set <basename>, you don't need full URLs in linked JavaScript files
  and CSS files

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-01 20:19:12 +01:00
parent 1940f6b499
commit 12e4bff880
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
24 changed files with 18 additions and 41 deletions

View File

@ -186,5 +186,3 @@ class Photo {
}
}
}}

View File

@ -191,4 +191,3 @@ function pop_scrape_target(&$array, $name) {
unset($array[$at]);
return count($array);
}}

View File

@ -72,5 +72,3 @@ function init_groups_visitor($contact_id) {
}
return $groups;
}}

View File

@ -111,4 +111,4 @@
$time = time() - $start_maintain;
if($verbose) echo("Maintenance completed. Took $time seconds.".PHP_EOL);
logger("Maintenance completed. Took $time seconds.");
}
}

View File

@ -161,4 +161,3 @@ function closedb() {
global $db;
// $db->close();
}}

View File

@ -25,4 +25,3 @@
fetch_url($dir . '?url=' . bin2hex($argv[1]));
exit;

View File

@ -241,4 +241,3 @@ function post_remote($a,$arr) {
return $current_post;
}

View File

@ -309,4 +309,3 @@
}
killme();

View File

@ -266,8 +266,5 @@
);
}
killme();

View File

@ -163,4 +163,3 @@
}
killme();

View File

@ -269,4 +269,4 @@ function nuke_record($url) {
}
}
return;
}
}

View File

@ -437,4 +437,4 @@ function run_pulling_job($a, $pull_batch, $db_host, $db_user, $db_pass, $db_data
}
}
}

View File

@ -3,4 +3,4 @@
<body>
Apologies but this site is unavailable at the moment. Please try again later.
</body>
</html>
</html>

View File

@ -689,4 +689,4 @@
this._createInput();
}
};
})();
})();

View File

View File

@ -30,4 +30,3 @@
closeMenu("comment-edit-submit-wrapper-" + id);
}
}

View File

@ -202,9 +202,9 @@ function health_details($a, $id)
);
if(count($r)){
//Include graphael line charts.
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.line-min.js"></script>';
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.line-min.js"></script>';
$speeds = array();
$times = array();
$mintime = time();
@ -249,9 +249,9 @@ function health_details($a, $id)
);
if($r && count($r)){
//Include graphael line charts.
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/include/g.line-min.js"></script>';
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.raphael.js"></script>'.PHP_EOL;
$a->page['htmlhead'] .= '<script type="text/javascript" src="'.$a->get_baseurl().'/js/g.line-min.js"></script>';
$speeds = array();
$times = array();
$mintime = time();

View File

@ -1,10 +0,0 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="$baseurl" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>

View File

@ -3,13 +3,14 @@
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<!--[if IE]>
<!--
@TODO Dead file
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
//-->
<![endif]-->
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="shortcut icon" href="images/friendica-32.png" />
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script type="text/javascript" src="js/jquery.js" ></script>
<script type="text/javascript" src="js/main.js" ></script>
<link rel="search" type="application/opensearchdescription+xml" title="Friendica Global Directory" href="$baseurl/opensearch" />