Updated htaccess to Apache 2.4 compat

Updated the htaccess string to generate a valid
Apache 2.4 htaccess file for the search database

diff --git a/article_dialog.ui b/article_dialog.ui
index f83647b..7fd1581 100644 (file)
--- a/article_dialog.ui
+++ b/article_dialog.ui
@@ -104,7 +104,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/bold.gif</normaloff>:/bia/resources/bold.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/bold.gif</normaloff>:/bia/resources/bold.gif</iconset>
      </property>
      <property name="shortcut">


@@ -137,7 +137,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/italic.gif</normaloff>:/bia/resources/italic.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/italic.gif</normaloff>:/bia/resources/italic.gif</iconset>
      </property>
      <property name="shortcut">


@@ -165,7 +165,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/pre.gif</normaloff>:/bia/resources/pre.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/pre.gif</normaloff>:/bia/resources/pre.gif</iconset>
      </property>
      <property name="shortcut">


@@ -193,7 +193,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/right.gif</normaloff>:/bia/resources/right.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/right.gif</normaloff>:/bia/resources/right.gif</iconset>
      </property>
      <property name="shortcut">


@@ -221,7 +221,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/justify.gif</normaloff>:/bia/resources/justify.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/justify.gif</normaloff>:/bia/resources/justify.gif</iconset>
      </property>
      <property name="shortcut">


@@ -249,7 +249,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/bullets.gif</normaloff>:/bia/resources/bullets.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/bullets.gif</normaloff>:/bia/resources/bullets.gif</iconset>
      </property>
      <property name="shortcut">


@@ -277,7 +277,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/numbers.gif</normaloff>:/bia/resources/numbers.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/numbers.gif</normaloff>:/bia/resources/numbers.gif</iconset>
      </property>
      <property name="shortcut">


@@ -305,7 +305,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/code.gif</normaloff>:/bia/resources/code.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/code.gif</normaloff>:/bia/resources/code.gif</iconset>
      </property>
      <property name="shortcut">


@@ -333,7 +333,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/table.gif</normaloff>:/bia/resources/table.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/table.gif</normaloff>:/bia/resources/table.gif</iconset>
      </property>
      <property name="shortcut">


@@ -361,7 +361,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/hr.gif</normaloff>:/bia/resources/hr.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/hr.gif</normaloff>:/bia/resources/hr.gif</iconset>
      </property>
      <property name="shortcut">


@@ -389,7 +389,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/par.gif</normaloff>:/bia/resources/par.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/par.gif</normaloff>:/bia/resources/par.gif</iconset>
      </property>
      <property name="shortcut">


@@ -417,7 +417,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/br.gif</normaloff>:/bia/resources/br.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/br.gif</normaloff>:/bia/resources/br.gif</iconset>
      </property>
      <property name="shortcut">


@@ -503,7 +503,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/img.gif</normaloff>:/bia/resources/img.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/img.gif</normaloff>:/bia/resources/img.gif</iconset>
      </property>
      <property name="shortcut">


@@ -531,7 +531,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/link.gif</normaloff>:/bia/resources/link.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/link.gif</normaloff>:/bia/resources/link.gif</iconset>
      </property>
      <property name="shortcut">


@@ -556,7 +556,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/center.gif</normaloff>:/bia/resources/center.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/center.gif</normaloff>:/bia/resources/center.gif</iconset>
      </property>
      <property name="shortcut">


@@ -584,7 +584,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/left.gif</normaloff>:/bia/resources/left.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/left.gif</normaloff>:/bia/resources/left.gif</iconset>
      </property>
      <property name="shortcut">


@@ -612,7 +612,7 @@ p, li { white-space: pre-wrap; }
       <string/>
      </property>
      <property name="icon">
       <string/>
      </property>
      <property name="icon">

-      <iconset resource="../../projects/BiaWeb_Qt/biaweb_rc.qrc">
+      <iconset resource="biaweb_rc.qrc">

        <normaloff>:/bia/resources/bquote.gif</normaloff>:/bia/resources/bquote.gif</iconset>
      </property>
      <property name="shortcut">
        <normaloff>:/bia/resources/bquote.gif</normaloff>:/bia/resources/bquote.gif</iconset>
      </property>
      <property name="shortcut">


@@ -685,7 +685,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>

-  <include location="../../projects/BiaWeb_Qt/biaweb_rc.qrc"/>
+  <include location="biaweb_rc.qrc"/>

  </resources>
  <connections>
   <connection>
  </resources>
  <connections>
   <connection>

diff --git a/biaweb_strings.py b/biaweb_strings.py
index 65cb21f..6917ffd 100644 (file)
--- a/biaweb_strings.py
+++ b/biaweb_strings.py
@@ -453,6 +453,8 @@ your
 z""".split ("\n")
 
 searchindex_htaccess = """<Files searchwords.idx>
 z""".split ("\n")
 
 searchindex_htaccess = """<Files searchwords.idx>

-       order allow,deny
-       deny from all
-</Files>"""
\ No newline at end of file
+       <RequireAll>
+               Require all denied
+       </RequireAll>
+</Files>"""
+