Merge branch 'master' of https://github.com/Geeklog-Core/geeklog

Geeklog-Core · Jan 18, 2022 · 3d882a2 · 3d882a2
2 parents ac1cdfc + 544df21
commit 3d882a2
Show file tree

Hide file tree

Showing 26 changed files with 73 additions and 77 deletions.
diff --git a/public_html/admin/plugins/polls/index.php b/public_html/admin/plugins/polls/index.php
@@ -39,7 +39,7 @@
  * @subpackage admin
  */
 
-global $_CONF, $_USER, $MESSAGE, $LANG_ADMIN, $LANG21;
+global $_CONF, $_USER, $MESSAGE, $LANG_ADMIN, $LANG21, $LANG25;
 
 // Geeklog common function library and Admin authentication
 require_once '../../../lib-common.php';
@@ -490,7 +490,7 @@ function editpoll($pid = '')
     $poll_templates->set_var('poll_id', $T['pid']);
     $poll_templates->set_var('lang_donotusespaces', $LANG25[7]);
     $poll_templates->set_var('lang_topic', $LANG25[9]);
-    $poll_templates->set_var('poll_topic', htmlspecialchars($T['topic']));
+    $poll_templates->set_var('poll_topic', COM_escHTML($T['topic']));
     $poll_templates->set_var('lang_mode', $LANG25[1]);
     $poll_templates->set_var('lang_topic_description', $LANG25[1003]);
     $poll_templates->set_var('topic_description', $T['description']);
@@ -568,20 +568,20 @@ function editpoll($pid = '')
             true
         );
         $Q = DB_fetchArray($questions);
-        $poll_templates->set_var('question_text', $Q['question']);
+        $poll_templates->set_var('question_text', isset($Q['question']) ? $Q['question'] : '');
         $poll_templates->set_var('question_id', $j);
         $poll_templates->set_var('lang_question', $LANG25[31] . " $display_id");
         $poll_templates->set_var('lang_saveaddnew', $LANG25[32]);
         $poll_templates->set_var('q_idx', $j);
         $poll_templates->set_var('lang_allow_multipleanswers', $LANG25[1001]);
-        if ($Q['allow_multipleanswers'] == 1) {
+        if (isset($Q['allow_multipleanswers']) && ($Q['allow_multipleanswers'] == 1)) {
             $poll_templates->set_var('poll_allow_multipleanswers', 'checked="checked"');
         } else {
             $poll_templates->set_var('poll_allow_multipleanswers', '');
         }
 
         $poll_templates->set_var('lang_questions_description', $LANG25[1002]);
-        $poll_templates->set_var('description', $Q['description']);
+        $poll_templates->set_var('description', isset($Q['description']) ? $Q['description'] : '');
 
         // answers
         $answer_sql = "SELECT answer,aid,votes,remark FROM {$_TABLES['pollanswers']} "
@@ -590,10 +590,9 @@ function editpoll($pid = '')
         $answers = DB_query($answer_sql);
 
         for ($i = 0; $i < $_PO_CONF['maxanswers']; $i++) {
-            if (isset($answers)) {
-                $A = DB_fetchArray($answers);
-                $poll_templates->set_var('answer_text',
-                    htmlspecialchars($A['answer']));
+            $A = DB_fetchArray($answers);
+            if (!empty($A)) {
+                $poll_templates->set_var('answer_text', COM_escHTML($A['answer']));
                 $poll_templates->set_var('answer_votes', $A['votes']);
                 $poll_templates->set_var('remark_text', $A['remark']);
             } else {
@@ -699,7 +698,7 @@ function deletePoll($pid)
         COM_errorLog('Ignored possibly manipulated request to delete a poll.');
         COM_redirect($_CONF['site_admin_url'] . '/plugins/polls/index.php');
     } elseif (SEC_checkToken()) {
-        $display .= deletePoll($pid);
+        deletePoll($pid);
     } else {
         COM_accessLog("User {$_USER['username']} tried to illegally delete poll {$pid} and failed CSRF checks.");
         COM_redirect($_CONF['site_admin_url'] . '/index.php');

diff --git a/public_html/layout/denim/css_ltr/style.almost-flat.css b/public_html/layout/denim/css_ltr/style.almost-flat.css
@@ -3063,14 +3063,14 @@ div.third-party-login {
 .story_icon a {
   margin-left: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim/css_ltr/style.almost-flat.min.css b/public_html/layout/denim/css_ltr/style.almost-flat.min.css
diff --git a/public_html/layout/denim/css_ltr/style.css b/public_html/layout/denim/css_ltr/style.css
@@ -3022,14 +3022,14 @@ div.third-party-login {
 .story_icon a {
   margin-left: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim/css_ltr/style.gradient.css b/public_html/layout/denim/css_ltr/style.gradient.css
@@ -3092,14 +3092,14 @@ div.third-party-login {
 .story_icon a {
   margin-left: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim/css_ltr/style.gradient.min.css b/public_html/layout/denim/css_ltr/style.gradient.min.css
diff --git a/public_html/layout/denim/css_ltr/style.min.css b/public_html/layout/denim/css_ltr/style.min.css
diff --git a/public_html/layout/denim/css_rtl/style.almost-flat.css b/public_html/layout/denim/css_rtl/style.almost-flat.css
@@ -3063,14 +3063,14 @@ div.third-party-login {
 .story_icon a {
   margin-right: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim/css_rtl/style.almost-flat.min.css b/public_html/layout/denim/css_rtl/style.almost-flat.min.css
diff --git a/public_html/layout/denim/css_rtl/style.css b/public_html/layout/denim/css_rtl/style.css
@@ -3023,14 +3023,14 @@ div.third-party-login {
 .story_icon a {
   margin-right: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim/css_rtl/style.gradient.css b/public_html/layout/denim/css_rtl/style.gradient.css
@@ -3092,14 +3092,14 @@ div.third-party-login {
 .story_icon a {
   margin-right: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim/css_rtl/style.gradient.min.css b/public_html/layout/denim/css_rtl/style.gradient.min.css
diff --git a/public_html/layout/denim/css_rtl/style.min.css b/public_html/layout/denim/css_rtl/style.min.css
diff --git a/public_html/layout/denim/css_src/src/stylus/sub/main_contents.styl b/public_html/layout/denim/css_src/src/stylus/sub/main_contents.styl
@@ -56,9 +56,8 @@ $stage = 'main_contents'
     a
         margin-left: 5px
     // All Mobile Sizes (devices and browser)
-    // Issue #1077
-    //@media only screen and (max-width: $breakpoint-small-max)
-    //    display: none
+    @media only screen and (max-width: $breakpoint-small-max)
+        /*display: none*/
     hook-selector($stage, "" + selector())
 
 /*! Story(Date, Auther, Display no.) */

diff --git a/public_html/layout/denim_curve/css_ltr/style.gradient.css b/public_html/layout/denim_curve/css_ltr/style.gradient.css
@@ -3260,14 +3260,14 @@ div.third-party-login {
 .story_icon a {
   margin-left: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim_curve/css_ltr/style.gradient.min.css b/public_html/layout/denim_curve/css_ltr/style.gradient.min.css
diff --git a/public_html/layout/denim_curve/css_rtl/style.gradient.css b/public_html/layout/denim_curve/css_rtl/style.gradient.css
@@ -3260,14 +3260,14 @@ div.third-party-login {
 .story_icon a {
   margin-right: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim_curve/css_rtl/style.gradient.min.css b/public_html/layout/denim_curve/css_rtl/style.gradient.min.css
diff --git a/public_html/layout/denim_curve/css_src/src/stylus/sub/main_contents.styl b/public_html/layout/denim_curve/css_src/src/stylus/sub/main_contents.styl
@@ -56,9 +56,8 @@ $stage = 'main_contents'
     a
         margin-left: 5px
     // All Mobile Sizes (devices and browser)
-    // Issue #1077
-    // @media only screen and (max-width: $breakpoint-small-max)
-    //    display: none
+    @media only screen and (max-width: $breakpoint-small-max)
+        /*display: none*/
     hook-selector($stage, "" + selector())
 
 /*! Story(Date, Auther, Display no.) */

diff --git a/public_html/layout/denim_three/css_ltr/style.css b/public_html/layout/denim_three/css_ltr/style.css
@@ -3411,14 +3411,14 @@ div.third-party-login {
 .story_icon a {
   margin-left: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 959px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim_three/css_ltr/style.min.css b/public_html/layout/denim_three/css_ltr/style.min.css
diff --git a/public_html/layout/denim_three/css_rtl/style.css b/public_html/layout/denim_three/css_rtl/style.css
@@ -3411,14 +3411,14 @@ div.third-party-login {
 .story_icon a {
   margin-right: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 959px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/denim_three/css_rtl/style.min.css b/public_html/layout/denim_three/css_rtl/style.min.css
diff --git a/public_html/layout/denim_three/css_src/src/stylus/sub/main_contents.styl b/public_html/layout/denim_three/css_src/src/stylus/sub/main_contents.styl
@@ -56,9 +56,8 @@ $stage = 'main_contents'
     a
         margin-left: 5px
     // All Mobile Sizes (devices and browser)
-    // Issue #1077
-    // @media only screen and (max-width: $breakpoint-small-max)
-    //    display: none
+    @media only screen and (max-width: $breakpoint-small-max)
+        /*display: none*/
     hook-selector($stage, "" + selector())
 
 /*! Story(Date, Auther, Display no.) */

diff --git a/public_html/layout/glnet_curve/css_ltr/style.gradient.css b/public_html/layout/glnet_curve/css_ltr/style.gradient.css
@@ -3260,14 +3260,14 @@ div.third-party-login {
 .story_icon a {
   margin-left: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;

diff --git a/public_html/layout/glnet_curve/css_rtl/style.gradient.css b/public_html/layout/glnet_curve/css_rtl/style.gradient.css
@@ -3260,14 +3260,14 @@ div.third-party-login {
 .story_icon a {
   margin-right: 5px;
 }
-/* Issue #1077
+
 @media only screen and (max-width: 767px) {
 
-  .story_icon {
+  /*.story_icon {
     display: none;
-  }
+  }*/
 }
-*/
+
 /* Story(Date, Auther, Display no.) */
 .story_status {
   list-style-position: outside;