diff --git a/.gitignore b/.gitignore index 2f8f95f..3302008 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ credentials.php -inside/credentials.php inside/tmp -.htaccess inside/migration/config.php migration.log error_log *.swp +.htaccess +payex_defines.php diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..8580d09 --- /dev/null +++ b/README.txt @@ -0,0 +1,11 @@ +== Konfigurasjon == +Du må endre instillinger for database, migrering (key og server) og payex betaling. + $ cp inside/credentials-sample php inside/credentials.php + $ cp inside/migration/config.example php inside/migration/config.php + $ cp includes/payex2/payex_defines.example.php includes/payex2/payex_defines.php + +Du trenger kanskje å endre ting i includes/Ldap_defines.php også. + +== Installasjon == +Legg inn Apache, MySQL og PHP. Du trenger også noen utvidelser til PHP. + $ sudo apt-get install php5-mysql php5-ldap diff --git a/inside/migration/css/nikolark.css b/css/migration/nikolark.css similarity index 100% rename from inside/migration/css/nikolark.css rename to css/migration/nikolark.css diff --git a/inside/migration/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/css/migration/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png rename to css/migration/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/inside/migration/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/css/migration/smoothness/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png rename to css/migration/smoothness/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/inside/migration/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/css/migration/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png rename to css/migration/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/inside/migration/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/css/migration/smoothness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png rename to css/migration/smoothness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/inside/migration/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/css/migration/smoothness/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png rename to css/migration/smoothness/images/ui-bg_glass_75_dadada_1x400.png diff --git a/inside/migration/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/css/migration/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png rename to css/migration/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/inside/migration/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/css/migration/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png rename to css/migration/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/inside/migration/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/css/migration/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to css/migration/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/inside/migration/css/smoothness/images/ui-icons_222222_256x240.png b/css/migration/smoothness/images/ui-icons_222222_256x240.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-icons_222222_256x240.png rename to css/migration/smoothness/images/ui-icons_222222_256x240.png diff --git a/inside/migration/css/smoothness/images/ui-icons_2e83ff_256x240.png b/css/migration/smoothness/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-icons_2e83ff_256x240.png rename to css/migration/smoothness/images/ui-icons_2e83ff_256x240.png diff --git a/inside/migration/css/smoothness/images/ui-icons_454545_256x240.png b/css/migration/smoothness/images/ui-icons_454545_256x240.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-icons_454545_256x240.png rename to css/migration/smoothness/images/ui-icons_454545_256x240.png diff --git a/inside/migration/css/smoothness/images/ui-icons_888888_256x240.png b/css/migration/smoothness/images/ui-icons_888888_256x240.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-icons_888888_256x240.png rename to css/migration/smoothness/images/ui-icons_888888_256x240.png diff --git a/inside/migration/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/css/migration/smoothness/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from inside/migration/css/smoothness/images/ui-icons_cd0a0a_256x240.png rename to css/migration/smoothness/images/ui-icons_cd0a0a_256x240.png diff --git a/inside/migration/css/smoothness/jquery-ui-1.8.14.custom.css b/css/migration/smoothness/jquery-ui-1.8.14.custom.css similarity index 100% rename from inside/migration/css/smoothness/jquery-ui-1.8.14.custom.css rename to css/migration/smoothness/jquery-ui-1.8.14.custom.css diff --git a/css/screen.css b/css/screen.css index f1d452a..db0e8cb 100644 --- a/css/screen.css +++ b/css/screen.css @@ -107,7 +107,7 @@ a.skip-nav { } a.contact { - background: url("../inside/graphics/user_go.png") no-repeat right; + background: url("../user_go.png") no-repeat right; padding-right: 20px; } /* =lists @@ -406,7 +406,7 @@ h4 { } li.menulist { - background: url(../inside/graphics/minus.png) no-repeat 3px 0.3em; + background: url(../graphics/minus.png) no-repeat 3px 0.3em; line-height: 1.2em; list-style: none outside; margin: 0px 0 10px; @@ -415,7 +415,7 @@ li.menulist { } .jsenabled li.menulist { - background: url(../inside/graphics/plus.png) no-repeat 3px 0.3em; + background: url(../graphics/plus.png) no-repeat 3px 0.3em; } .jsenabled .menu, .jsenabled .submenu { diff --git a/css/style.css b/css/style.css index bfc2aab..2f544d8 100644 --- a/css/style.css +++ b/css/style.css @@ -80,7 +80,7 @@ body.dns { } /*body.dns */ #header { - background:#191919 url('../inside/graphics/header-210x.png') repeat-x bottom; + background:#191919 url('../graphics/header-210x.png') repeat-x bottom; } #header { height:110px; @@ -92,7 +92,7 @@ body.dns { z-index:999 } .site-title a { - background: url('../inside/graphics/bannerindex-400.png') no-repeat -20px 0; + background: url('../graphics/bannerindex-400.png') no-repeat -20px 0; display:block; height:63px; margin-top:20px; diff --git a/inside/graphics/bannerindex-400.png b/graphics/bannerindex-400.png similarity index 100% rename from inside/graphics/bannerindex-400.png rename to graphics/bannerindex-400.png diff --git a/inside/graphics/bar.png b/graphics/bar.png similarity index 100% rename from inside/graphics/bar.png rename to graphics/bar.png diff --git a/inside/graphics/call_to.png b/graphics/call_to.png similarity index 100% rename from inside/graphics/call_to.png rename to graphics/call_to.png diff --git a/inside/graphics/cross.png b/graphics/cross.png similarity index 100% rename from inside/graphics/cross.png rename to graphics/cross.png diff --git a/inside/graphics/delete.png b/graphics/delete.png similarity index 100% rename from inside/graphics/delete.png rename to graphics/delete.png diff --git a/inside/graphics/delete_small.png b/graphics/delete_small.png similarity index 100% rename from inside/graphics/delete_small.png rename to graphics/delete_small.png diff --git a/inside/graphics/edit.png b/graphics/edit.png similarity index 100% rename from inside/graphics/edit.png rename to graphics/edit.png diff --git a/inside/graphics/header-210x.png b/graphics/header-210x.png similarity index 100% rename from inside/graphics/header-210x.png rename to graphics/header-210x.png diff --git a/inside/graphics/minus.png b/graphics/minus.png similarity index 100% rename from inside/graphics/minus.png rename to graphics/minus.png diff --git a/inside/graphics/payex.png b/graphics/payex.png similarity index 100% rename from inside/graphics/payex.png rename to graphics/payex.png diff --git a/inside/graphics/plus.png b/graphics/plus.png similarity index 100% rename from inside/graphics/plus.png rename to graphics/plus.png diff --git a/inside/graphics/star.png b/graphics/star.png similarity index 100% rename from inside/graphics/star.png rename to graphics/star.png diff --git a/inside/graphics/tick.png b/graphics/tick.png similarity index 100% rename from inside/graphics/tick.png rename to graphics/tick.png diff --git a/inside/graphics/user_go.png b/graphics/user_go.png similarity index 100% rename from inside/graphics/user_go.png rename to graphics/user_go.png diff --git a/includes/Ldap_defines.php b/includes/Ldap_defines.php index 41414b3..cdb1efa 100644 --- a/includes/Ldap_defines.php +++ b/includes/Ldap_defines.php @@ -39,6 +39,7 @@ define("RADIUS_MYSQL_HOST", "snes.neuf.no"); define("RADIUS_MYSQL_USER", apache_getenv("RADIUS_MYSQL_USER")); define("RADIUS_MYSQL_PASS", apache_getenv("RADIUS_MYSQL_PASS")); +define("LDAP_ENABLED", false); define("LDAP_SERVER", "macgyver.neuf.no"); $api_keys = array(); diff --git a/payex2/lib/LICENCE-LGPL.txt b/includes/payex2/lib/LICENCE-LGPL.txt similarity index 100% rename from payex2/lib/LICENCE-LGPL.txt rename to includes/payex2/lib/LICENCE-LGPL.txt diff --git a/payex2/lib/kqxmlobj.php b/includes/payex2/lib/kqxmlobj.php similarity index 100% rename from payex2/lib/kqxmlobj.php rename to includes/payex2/lib/kqxmlobj.php diff --git a/payex2/lib/nusoap.php b/includes/payex2/lib/nusoap.php similarity index 100% rename from payex2/lib/nusoap.php rename to includes/payex2/lib/nusoap.php diff --git a/payex2/payex.php b/includes/payex2/payex.php similarity index 100% rename from payex2/payex.php rename to includes/payex2/payex.php diff --git a/includes/payex2/payex_defines.example.php b/includes/payex2/payex_defines.example.php new file mode 100644 index 0000000..68e3537 --- /dev/null +++ b/includes/payex2/payex_defines.example.php @@ -0,0 +1,68 @@ + diff --git a/payex2/payex_pxaccount.php b/includes/payex2/payex_pxaccount.php similarity index 100% rename from payex2/payex_pxaccount.php rename to includes/payex2/payex_pxaccount.php diff --git a/payex2/payex_pxagreement.php b/includes/payex2/payex_pxagreement.php similarity index 100% rename from payex2/payex_pxagreement.php rename to includes/payex2/payex_pxagreement.php diff --git a/payex2/payex_pxclient.php b/includes/payex2/payex_pxclient.php similarity index 100% rename from payex2/payex_pxclient.php rename to includes/payex2/payex_pxclient.php diff --git a/payex2/payex_pxdeposit.php b/includes/payex2/payex_pxdeposit.php similarity index 100% rename from payex2/payex_pxdeposit.php rename to includes/payex2/payex_pxdeposit.php diff --git a/payex2/payex_pxmerchant.php b/includes/payex2/payex_pxmerchant.php similarity index 100% rename from payex2/payex_pxmerchant.php rename to includes/payex2/payex_pxmerchant.php diff --git a/payex2/payex_pxorder.php b/includes/payex2/payex_pxorder.php similarity index 100% rename from payex2/payex_pxorder.php rename to includes/payex2/payex_pxorder.php diff --git a/payex2/payex_pxpartner.php b/includes/payex2/payex_pxpartner.php similarity index 100% rename from payex2/payex_pxpartner.php rename to includes/payex2/payex_pxpartner.php diff --git a/payex2/payex_pxprint.php b/includes/payex2/payex_pxprint.php similarity index 100% rename from payex2/payex_pxprint.php rename to includes/payex2/payex_pxprint.php diff --git a/payex2/payex_pxrecurring.php b/includes/payex2/payex_pxrecurring.php similarity index 100% rename from payex2/payex_pxrecurring.php rename to includes/payex2/payex_pxrecurring.php diff --git a/payex2/payex_pxredirect.php b/includes/payex2/payex_pxredirect.php similarity index 100% rename from payex2/payex_pxredirect.php rename to includes/payex2/payex_pxredirect.php diff --git a/payex2/payex_pxsms.php b/includes/payex2/payex_pxsms.php similarity index 100% rename from payex2/payex_pxsms.php rename to includes/payex2/payex_pxsms.php diff --git a/payex2/payex_pxsubscription.php b/includes/payex2/payex_pxsubscription.php similarity index 100% rename from payex2/payex_pxsubscription.php rename to includes/payex2/payex_pxsubscription.php diff --git a/payex2/payex_setup.php b/includes/payex2/payex_setup.php similarity index 100% rename from payex2/payex_setup.php rename to includes/payex2/payex_setup.php diff --git a/payex2/tmp b/includes/payex2/tmp similarity index 100% rename from payex2/tmp rename to includes/payex2/tmp diff --git a/payex2/wsdl/external.payex.com-pxaccount.wsdl b/includes/payex2/wsdl/external.payex.com-pxaccount.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxaccount.wsdl rename to includes/payex2/wsdl/external.payex.com-pxaccount.wsdl diff --git a/payex2/wsdl/external.payex.com-pxagreement.wsdl b/includes/payex2/wsdl/external.payex.com-pxagreement.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxagreement.wsdl rename to includes/payex2/wsdl/external.payex.com-pxagreement.wsdl diff --git a/payex2/wsdl/external.payex.com-pxclient.wsdl b/includes/payex2/wsdl/external.payex.com-pxclient.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxclient.wsdl rename to includes/payex2/wsdl/external.payex.com-pxclient.wsdl diff --git a/payex2/wsdl/external.payex.com-pxdeposit.wsdl b/includes/payex2/wsdl/external.payex.com-pxdeposit.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxdeposit.wsdl rename to includes/payex2/wsdl/external.payex.com-pxdeposit.wsdl diff --git a/payex2/wsdl/external.payex.com-pxmerchant.wsdl b/includes/payex2/wsdl/external.payex.com-pxmerchant.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxmerchant.wsdl rename to includes/payex2/wsdl/external.payex.com-pxmerchant.wsdl diff --git a/payex2/wsdl/external.payex.com-pxorder.wsdl b/includes/payex2/wsdl/external.payex.com-pxorder.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxorder.wsdl rename to includes/payex2/wsdl/external.payex.com-pxorder.wsdl diff --git a/payex2/wsdl/external.payex.com-pxprint.wsdl b/includes/payex2/wsdl/external.payex.com-pxprint.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxprint.wsdl rename to includes/payex2/wsdl/external.payex.com-pxprint.wsdl diff --git a/payex2/wsdl/external.payex.com-pxrecurring.wsdl b/includes/payex2/wsdl/external.payex.com-pxrecurring.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxrecurring.wsdl rename to includes/payex2/wsdl/external.payex.com-pxrecurring.wsdl diff --git a/payex2/wsdl/external.payex.com-pxsms.wsdl b/includes/payex2/wsdl/external.payex.com-pxsms.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxsms.wsdl rename to includes/payex2/wsdl/external.payex.com-pxsms.wsdl diff --git a/payex2/wsdl/external.payex.com-pxsubscription.wsdl b/includes/payex2/wsdl/external.payex.com-pxsubscription.wsdl similarity index 100% rename from payex2/wsdl/external.payex.com-pxsubscription.wsdl rename to includes/payex2/wsdl/external.payex.com-pxsubscription.wsdl diff --git a/payex2/wsdl/test.payex.com-pxaccount.wsdl b/includes/payex2/wsdl/test.payex.com-pxaccount.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxaccount.wsdl rename to includes/payex2/wsdl/test.payex.com-pxaccount.wsdl diff --git a/payex2/wsdl/test.payex.com-pxagreement.wsdl b/includes/payex2/wsdl/test.payex.com-pxagreement.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxagreement.wsdl rename to includes/payex2/wsdl/test.payex.com-pxagreement.wsdl diff --git a/payex2/wsdl/test.payex.com-pxclient.wsdl b/includes/payex2/wsdl/test.payex.com-pxclient.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxclient.wsdl rename to includes/payex2/wsdl/test.payex.com-pxclient.wsdl diff --git a/payex2/wsdl/test.payex.com-pxdeposit.wsdl b/includes/payex2/wsdl/test.payex.com-pxdeposit.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxdeposit.wsdl rename to includes/payex2/wsdl/test.payex.com-pxdeposit.wsdl diff --git a/payex2/wsdl/test.payex.com-pxmerchant.wsdl b/includes/payex2/wsdl/test.payex.com-pxmerchant.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxmerchant.wsdl rename to includes/payex2/wsdl/test.payex.com-pxmerchant.wsdl diff --git a/payex2/wsdl/test.payex.com-pxorder.wsdl b/includes/payex2/wsdl/test.payex.com-pxorder.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxorder.wsdl rename to includes/payex2/wsdl/test.payex.com-pxorder.wsdl diff --git a/payex2/wsdl/test.payex.com-pxprint.wsdl b/includes/payex2/wsdl/test.payex.com-pxprint.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxprint.wsdl rename to includes/payex2/wsdl/test.payex.com-pxprint.wsdl diff --git a/payex2/wsdl/test.payex.com-pxrecurring.wsdl b/includes/payex2/wsdl/test.payex.com-pxrecurring.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxrecurring.wsdl rename to includes/payex2/wsdl/test.payex.com-pxrecurring.wsdl diff --git a/payex2/wsdl/test.payex.com-pxsms.wsdl b/includes/payex2/wsdl/test.payex.com-pxsms.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxsms.wsdl rename to includes/payex2/wsdl/test.payex.com-pxsms.wsdl diff --git a/payex2/wsdl/test.payex.com-pxsubscription.wsdl b/includes/payex2/wsdl/test.payex.com-pxsubscription.wsdl similarity index 100% rename from payex2/wsdl/test.payex.com-pxsubscription.wsdl rename to includes/payex2/wsdl/test.payex.com-pxsubscription.wsdl diff --git a/index.php b/index.php new file mode 100644 index 0000000..349668a --- /dev/null +++ b/index.php @@ -0,0 +1,13 @@ +performAction(); + +$p = new Page(); +$p->display(); + +?> diff --git a/inside/Documents.php b/inside/Documents.php index c6b2033..05486a3 100644 --- a/inside/Documents.php +++ b/inside/Documents.php @@ -64,7 +64,7 @@ class Documents { fetchRow(DB_FETCHMODE_OBJECT)){?> - name; ?> + name; ?> category; ?> _tags_to_links($row->tags); ?> date, "td"); ?> @@ -113,7 +113,7 @@ class Documents { fetchRow(DB_FETCHMODE_OBJECT)){?> - name; ?> + name; ?> category; ?> _tags_to_links($row->tags); ?> date, "td"); ?> @@ -146,4 +146,4 @@ class Documents { } -?> \ No newline at end of file +?> diff --git a/inside/Navigation.php b/inside/Navigation.php index 5346e73..beddbcd 100644 --- a/inside/Navigation.php +++ b/inside/Navigation.php @@ -26,7 +26,8 @@ class Navigation {
  • Meldinger @@ -36,7 +37,7 @@ class Navigation {
  • Ny melding
    • - + @@ -52,7 +53,8 @@ class Navigation {
  • Tappetårnets vaktliste @@ -64,9 +66,10 @@ class Navigation {
    • - +
  • Møter/kurs/internfester @@ -79,9 +82,10 @@ class Navigation { ?>
  • Kombolender
    • - +
  • Konserter/program @@ -97,7 +101,7 @@ class Navigation {
    • - + @@ -194,7 +198,8 @@ class Navigation {
  • Nyheter @@ -203,15 +208,15 @@ class Navigation {
  • Skriv nyhet
    • - +
  • Innstillinger