diff --git a/.htaccess b/.htaccess
index ff0cd5a..301a066 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,6 @@
LimitRequestBody 20971520
-RewriteEngine On
-RewriteEngine on
-RewriteRule ^calendar([0-9]+).ics$ calendar4.php?u=$1 [QSA]
+#RewriteEngine on
+#RewriteRule ^calendar([0-9]+).ics$ calendar4.php?u=$1 [QSA]
-RewriteRule ^api/(.*)$ api2.php?query=$1 [L,QSA]
\ No newline at end of file
+#RewriteRule ^api/(.*)$ api2.php?query=$1 [L,QSA]
\ No newline at end of file
diff --git a/about.php b/about.php
new file mode 100644
index 0000000..d2b25e4
--- /dev/null
+++ b/about.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/act.php b/act.php
index fd99cd3..9f42f94 100644
--- a/act.php
+++ b/act.php
@@ -24,6 +24,8 @@
$MY_TITLE = "Events, Training, & Workshops";
$MY_CRUMB = "Activities";
$MY_PATH = $_SERVER['PHP_SELF'];
+
+ $FOCUS = "sp24";
?>
@@ -45,7 +47,7 @@
diff --git a/api2.php b/api2.php
index eb7b669..f73444d 100644
--- a/api2.php
+++ b/api2.php
@@ -51,8 +51,7 @@ function multi_row_select($qry, $j=1) { global $c; $rows = array();
function multi_row_1d($qry) { global $c;
$savedQuery = mysqli_query($c, $qry);
- while($savedResult = mysqli_fetch_array($savedQuery)) {
- $savedArray[] = $savedResult[0]; }
+ while($savedResult = mysqli_fetch_array($savedQuery)) { $savedArray[] = $savedResult[0]; }
return $savedArray; }
@@ -149,20 +148,20 @@ if (is_null($USER)) {
// Define URL templates and associated SQL queries
-$queries = [
+$queries = array(
'/users/{id}' => 'SELECT * FROM users WHERE id = :id',
'/users' => 'SELECT * FROM users',
'/products' => 'SELECT * FROM products',
'/sessions' => 'SELECT c.id,c.title,c.desc,c.length,c.starttime,c.track,c.location,c.location_irl,c.mode,c.gets_survey,c.category,c.parent,c.recording,c.instructions,c.image_url,c.is_flex_approved,c.cal_uid,sst.type AS typeStr, sst.id AS type, GROUP_CONCAT(ctg.tag) AS tags FROM conf_sessions c LEFT JOIN conf_sessiontypes sst ON c.type=sst.id LEFT JOIN conf_tagmember ct ON c.id=ct.session LEFT JOIN conf_tags ctg ON ctg.id=ct.tag GROUP BY c.id ORDER BY c.track, c.starttime;',
'/ses/{day}' => 'SELECT c.id,c.title,c.desc,c.length,c.starttime,c.track,c.location,c.location_irl,c.mode,c.gets_survey,c.category,c.parent,c.recording,c.image_url,c.is_flex_approved,c.cal_uid,sst.type AS typeStr, sst.id AS type, GROUP_CONCAT(ctg.tag) AS tags FROM conf_sessions c LEFT JOIN conf_sessiontypes sst ON c.type=sst.id LEFT JOIN conf_tagmember ct ON c.id=ct.session LEFT JOIN conf_tags ctg ON ctg.id=ct.tag WHERE c.starttime LIKE \'%:day%\' GROUP BY c.id ORDER BY c.track, c.starttime;',
'/settings' => 'SELECT * FROM conf_uinforecord;'
-];
+);
-$functions = [
+$functions = array(
'/app' => 'appdata',
'/start' => 'startup',
'/update/activity' => 'set_sessioninfo',
-];
+);
if (1) { //// ($_SERVER['REQUEST_METHOD'] === 'GET') {
@@ -177,7 +176,7 @@ if (1) { //// ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (preg_match("#^$pattern$#", $requestUrl, $matches)) {
// Extract parameter values
- $params = [];
+ $params = array();
preg_match_all('/{([\-_\w]+)}/', $urlTemplate, $paramNames);
foreach ($paramNames[1] as $index => $paramName) {
$paramValue = $matches[$index + 1];
@@ -216,7 +215,7 @@ if (1) { //// ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (preg_match("#^$pattern$#", $requestUrl, $matches)) {
// Extract parameter values
- $params = [];
+ $params = array();
preg_match_all('/{([\-_\w]+)}/', $urlTemplate, $paramNames);
foreach ($paramNames[1] as $index => $paramName) {
$paramValue = $matches[$index + 1];
@@ -361,7 +360,7 @@ function set_sessioninfo() {
$q = array_reduce($cv, 'reducer', "UPDATE `{$table}` SET ");
$q = substr($q, 0, -2);
$q .= $WHERECLAUSE;
- single_row_update($q,0,$c2);
+ single_row_update($q,0);
echo json_encode( array("rawvalstr"=>$_REQUEST['vals'], "result"=>"success","action"=>"updated", "query"=>$q,"err"=>mysqli_error($c2)));
} else {
echo json_encode( array("result"=>"fail", "err"=>"no activity id specified") ); }
diff --git a/dir_api.php b/dir_api.php
index f750773..21eb3f3 100644
--- a/dir_api.php
+++ b/dir_api.php
@@ -86,7 +86,7 @@ $options_array = multi_row_select($options_query, 0, $c2);
$OPTIONS = array_reduce($options_array, function ($result, $item) {
$result[$item["label"]] = $item["value"];
- return $result; }, []);
+ return $result; }, array());
$default_ay_query = "SELECT begin,end FROM conf_academicyears ca JOIN conf_uinforecord cu ON cu.value=ca.id WHERE cu.label='default_ay';";
$AY = single_row_select($default_ay_query,0, $c2);
diff --git a/js/dir_app.js b/js/dir_app.js
index 4160e61..ac3b4cd 100644
--- a/js/dir_app.js
+++ b/js/dir_app.js
@@ -1,7 +1,7 @@
var PROD = 0
-
+
if (PROD && location.protocol !== 'https:') {
location.replace(`https:${location.href.substring(location.protocol.length)}`);
@@ -17,7 +17,7 @@ if (PROD && location.protocol !== 'https:') {
// | | | | __/ | |_) | __/ | \__ \
// |_| |_|\___|_| .__/ \___|_| |___/
// | |
-// |_|
+// |_|
@@ -930,6 +930,7 @@ const ActivityList = Vue.component('activitylist', {
console.log(day)
var d = dayjs(day, 'MMM DD YYYY')
convertedDateString = d.format('YYYY-MM-DD')
+ console.log(convertedDateString)
return _.findWhere( this.conference, {date1:convertedDateString} ).title
},
month_year: function(d) { var b = this.$root.$dj(d).format('MMM D YYYY'); return b },
@@ -938,10 +939,10 @@ const ActivityList = Vue.component('activitylist', {
else { this.reversed = false; this.sortby = ss } },
swapme: function(x) { this.editing = x },
done_edit: function(id) { this.editing = -1 },
- am_editing: function(id) { return 0 },
+ am_editing: function(id) { return 1 },
fetch_myevents: function() {
var self = this;
- basic_get('api/app',
+ basic_get('api2.php?query=app',
function(r2) {
self.mysessions = r2.mysessions
self.activities = r2.sessions
@@ -1011,65 +1012,79 @@ const ActivityList = Vue.component('activitylist', {
var self=this; return _.groupBy(self.mysessions_filtered, function(x) { return self.month_year(x.starttime) } ); }, },
watch: { },
template: `
-
- Current time is: {{ current_time }}. Return here for the ZOOM links on the day of your sessions.
-
-
-
-
It looks like you haven't signed up for any sessions yet!
- Go to the
Sessions List to sign up.
-
-
-
{{mmyy}} {{get_day_title(mmyy)}}
-
-
-
-
{{a.title}}
-
- {{ $root.$dj(a.starttime).format('h:mma') }}
-
- - In person at {{a.location_irl}} or
- online
-
- - In person at {{a.location_irl}}
- - Online
- - Online
-
-
-
-
+
+
+
+
+
{{mmyy}} {{get_day_title(mmyy)}}
-
-
-
{{mmyy}} {{get_day_title(mmyy)}}
+
-
+
+
+
+
+
+ Current time is: {{ current_time }}. Return here for the ZOOM links on the day of your sessions.
+
+
+
+
It looks like you haven't signed up for any sessions yet!
+ Go to the
Sessions List to sign up.
+
+
+
{{mmyy}} {{get_day_title(mmyy)}}
+
+
+
+
{{a.title}}
+
+ {{ $root.$dj(a.starttime).format('h:mma') }}
+
+ - In person at {{a.location_irl}} or
+ online
+
+ - In person at {{a.location_irl}}
+ - Online
+ - Online
+
+
+
+
+
+
+
+
{{mmyy}} {{get_day_title(mmyy)}}
+
+
+
+
` })
@@ -1174,7 +1189,7 @@ const ChartView = Vue.component('chartview', {
am_editing: function(id) { return 0 },
fetch_myevents: function() {
var self = this;
- basic_get('api/ses/'+self.day,
+ basic_get('api2.php?query=ses/'+self.day,
function(r2) {
r2 = r2.data
self.activities = _.sortBy(r2,function(x) { return x.starttime } ); self.$forceUpdate()
@@ -2166,7 +2181,7 @@ var app = new Vue({
computed: { },
mounted: function() {
var self = this;
- fetch('api/start', { method: 'GET' }).then(function (response) {
+ fetch('api2.php?query=start', { method: 'GET' }).then(function (response) {
// The API call was successful!
if (response.ok) {
response.json().then( function(r2) {